diff --git a/packages/node/src/machine/ethereum/eth-virtual-app-agreement-commitment.ts b/packages/node/src/ethereum/eth-virtual-app-agreement-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/eth-virtual-app-agreement-commitment.ts
rename to packages/node/src/ethereum/eth-virtual-app-agreement-commitment.ts
diff --git a/packages/node/src/machine/ethereum/index.ts b/packages/node/src/ethereum/index.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/index.ts
rename to packages/node/src/ethereum/index.ts
diff --git a/packages/node/src/machine/ethereum/install-commitment.ts b/packages/node/src/ethereum/install-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/install-commitment.ts
rename to packages/node/src/ethereum/install-commitment.ts
diff --git a/packages/node/src/machine/ethereum/multisend-commitment.ts b/packages/node/src/ethereum/multisend-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/multisend-commitment.ts
rename to packages/node/src/ethereum/multisend-commitment.ts
diff --git a/packages/node/src/machine/ethereum/multisig-commitment.ts b/packages/node/src/ethereum/multisig-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/multisig-commitment.ts
rename to packages/node/src/ethereum/multisig-commitment.ts
diff --git a/packages/node/src/machine/ethereum/set-state-commitment.ts b/packages/node/src/ethereum/set-state-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/set-state-commitment.ts
rename to packages/node/src/ethereum/set-state-commitment.ts
diff --git a/packages/node/src/machine/ethereum/setup-commitment.ts b/packages/node/src/ethereum/setup-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/setup-commitment.ts
rename to packages/node/src/ethereum/setup-commitment.ts
diff --git a/packages/node/src/machine/ethereum/types.ts b/packages/node/src/ethereum/types.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/types.ts
rename to packages/node/src/ethereum/types.ts
diff --git a/packages/node/src/machine/ethereum/uninstall-commitment.ts b/packages/node/src/ethereum/uninstall-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/uninstall-commitment.ts
rename to packages/node/src/ethereum/uninstall-commitment.ts
diff --git a/packages/node/src/machine/ethereum/utils/app-identity.ts b/packages/node/src/ethereum/utils/app-identity.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/utils/app-identity.ts
rename to packages/node/src/ethereum/utils/app-identity.ts
diff --git a/packages/node/src/machine/ethereum/utils/encodings.ts b/packages/node/src/ethereum/utils/encodings.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/utils/encodings.ts
rename to packages/node/src/ethereum/utils/encodings.ts
diff --git a/packages/node/src/machine/ethereum/utils/eth-bucket.ts b/packages/node/src/ethereum/utils/eth-bucket.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/utils/eth-bucket.ts
rename to packages/node/src/ethereum/utils/eth-bucket.ts
diff --git a/packages/node/src/machine/ethereum/utils/index.ts b/packages/node/src/ethereum/utils/index.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/utils/index.ts
rename to packages/node/src/ethereum/utils/index.ts
diff --git a/packages/node/src/machine/ethereum/utils/multisend-decoder.ts b/packages/node/src/ethereum/utils/multisend-decoder.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/utils/multisend-decoder.ts
rename to packages/node/src/ethereum/utils/multisend-decoder.ts
diff --git a/packages/node/src/machine/ethereum/utils/multisend-encoder.ts b/packages/node/src/ethereum/utils/multisend-encoder.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/utils/multisend-encoder.ts
rename to packages/node/src/ethereum/utils/multisend-encoder.ts
diff --git a/packages/node/src/machine/ethereum/virtual-app-set-state-commitment.ts b/packages/node/src/ethereum/virtual-app-set-state-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/virtual-app-set-state-commitment.ts
rename to packages/node/src/ethereum/virtual-app-set-state-commitment.ts
diff --git a/packages/node/src/machine/ethereum/withdraw-eth-commitment.ts b/packages/node/src/ethereum/withdraw-eth-commitment.ts
similarity index 100%
rename from packages/node/src/machine/ethereum/withdraw-eth-commitment.ts
rename to packages/node/src/ethereum/withdraw-eth-commitment.ts
diff --git a/packages/node/src/machine/index.ts b/packages/node/src/machine/index.ts
index e18c5e586..6f567fa2d 100644
--- a/packages/node/src/machine/index.ts
+++ b/packages/node/src/machine/index.ts
@@ -1,12 +1,13 @@
-import { Opcode, Protocol } from "./enums";
-import { appIdentityToHash } from "./ethereum/utils/app-identity";
-import { InstructionExecutor } from "./instruction-executor";
+import { appIdentityToHash } from "../ethereum/utils/app-identity";
 import {
   AppInstance,
   AppInstanceJson,
   StateChannel,
   StateChannelJSON
-} from "./models";
+} from "../models";
+
+import { Opcode, Protocol } from "./enums";
+import { InstructionExecutor } from "./instruction-executor";
 import {
   Context,
   InstallParams,
diff --git a/packages/node/src/machine/instruction-executor.ts b/packages/node/src/machine/instruction-executor.ts
index 73b07e19e..bd4c770bd 100644
--- a/packages/node/src/machine/instruction-executor.ts
+++ b/packages/node/src/machine/instruction-executor.ts
@@ -1,10 +1,11 @@
 import { NetworkContext } from "@counterfactual/types";
 import { BaseProvider } from "ethers/providers";
 
+import { StateChannel } from "../models";
+import { getProtocolFromName } from "../protocol";
+
 import { Opcode, Protocol } from "./enums";
 import { MiddlewareContainer } from "./middleware";
-import { StateChannel } from "./models";
-import { getProtocolFromName } from "./protocol";
 import {
   Context,
   InstallParams,
diff --git a/packages/node/src/machine/models/index.ts b/packages/node/src/machine/models/index.ts
deleted file mode 100644
index 128b11747..000000000
--- a/packages/node/src/machine/models/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { AppInstance, AppInstanceJson } from "./app-instance";
-import {
-  ETHVirtualAppAgreementInstance,
-  ETHVirtualAppAgreementJson
-} from "./eth-virtual-app-agreement-instance";
-import { StateChannel, StateChannelJSON } from "./state-channel";
-
-export {
-  AppInstance,
-  AppInstanceJson,
-  ETHVirtualAppAgreementInstance,
-  ETHVirtualAppAgreementJson,
-  StateChannel,
-  StateChannelJSON
-};
diff --git a/packages/node/src/machine/types.ts b/packages/node/src/machine/types.ts
index 1a967a681..69503797b 100644
--- a/packages/node/src/machine/types.ts
+++ b/packages/node/src/machine/types.ts
@@ -7,9 +7,10 @@ import {
 import { BaseProvider } from "ethers/providers";
 import { BigNumber, Signature } from "ethers/utils";
 
+import { Transaction } from "../ethereum/types";
+import { StateChannel } from "../models";
+
 import { Opcode, Protocol } from "./enums";
-import { Transaction } from "./ethereum/types";
-import { StateChannel } from "./models";
 
 export type ProtocolExecutionFlow = {
   [x: number]: (context: Context) => AsyncIterableIterator<any[]>;
diff --git a/packages/node/src/machine/models/app-instance.ts b/packages/node/src/models/app-instance.ts
similarity index 100%
rename from packages/node/src/machine/models/app-instance.ts
rename to packages/node/src/models/app-instance.ts
diff --git a/packages/node/src/machine/models/eth-virtual-app-agreement-instance.ts b/packages/node/src/models/eth-virtual-app-agreement-instance.ts
similarity index 100%
rename from packages/node/src/machine/models/eth-virtual-app-agreement-instance.ts
rename to packages/node/src/models/eth-virtual-app-agreement-instance.ts
diff --git a/packages/node/src/models/index.ts b/packages/node/src/models/index.ts
index 0e031c67b..b402ada16 100644
--- a/packages/node/src/models/index.ts
+++ b/packages/node/src/models/index.ts
@@ -1 +1,21 @@
-export * from "./proposed-app-instance-info";
+import { AppInstance, AppInstanceJson } from "./app-instance";
+import {
+  ETHVirtualAppAgreementInstance,
+  ETHVirtualAppAgreementJson
+} from "./eth-virtual-app-agreement-instance";
+import {
+  ProposedAppInstanceInfo,
+  ProposedAppInstanceInfoJSON
+} from "./proposed-app-instance-info";
+import { StateChannel, StateChannelJSON } from "./state-channel";
+
+export {
+  AppInstance,
+  AppInstanceJson,
+  ETHVirtualAppAgreementInstance,
+  ETHVirtualAppAgreementJson,
+  ProposedAppInstanceInfo,
+  ProposedAppInstanceInfoJSON,
+  StateChannel,
+  StateChannelJSON
+};
diff --git a/packages/node/src/machine/models/state-channel.ts b/packages/node/src/models/state-channel.ts
similarity index 99%
rename from packages/node/src/machine/models/state-channel.ts
rename to packages/node/src/models/state-channel.ts
index 6f16b7dea..2145b6056 100644
--- a/packages/node/src/machine/models/state-channel.ts
+++ b/packages/node/src/models/state-channel.ts
@@ -11,7 +11,7 @@ import {
   getETHBucketAppInterface,
   unlimitedETH
 } from "../ethereum/utils/eth-bucket";
-import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../xkeys";
+import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../machine/xkeys";
 
 import { AppInstance, AppInstanceJson } from "./app-instance";
 import {
diff --git a/packages/node/src/machine/protocol/index.ts b/packages/node/src/protocol/index.ts
similarity index 92%
rename from packages/node/src/machine/protocol/index.ts
rename to packages/node/src/protocol/index.ts
index d406432fa..8c638a3f6 100644
--- a/packages/node/src/machine/protocol/index.ts
+++ b/packages/node/src/protocol/index.ts
@@ -1,5 +1,5 @@
-import { Protocol } from "../enums";
-import { ProtocolExecutionFlow } from "../types";
+import { Protocol } from "../machine/enums";
+import { ProtocolExecutionFlow } from "../machine/types";
 
 import { INSTALL_PROTOCOL } from "./install";
 import { INSTALL_VIRTUAL_APP_PROTOCOL } from "./install-virtual-app";
diff --git a/packages/node/src/machine/protocol/install-virtual-app.ts b/packages/node/src/protocol/install-virtual-app.ts
similarity index 98%
rename from packages/node/src/machine/protocol/install-virtual-app.ts
rename to packages/node/src/protocol/install-virtual-app.ts
index 15b4a0580..f2fee00fd 100644
--- a/packages/node/src/machine/protocol/install-virtual-app.ts
+++ b/packages/node/src/protocol/install-virtual-app.ts
@@ -7,22 +7,22 @@ import {
 import { AddressZero } from "ethers/constants";
 import { bigNumberify, BigNumberish } from "ethers/utils";
 
-import { Opcode } from "../enums";
 import { ETHVirtualAppAgreementCommitment } from "../ethereum/eth-virtual-app-agreement-commitment";
 import { VirtualAppSetStateCommitment } from "../ethereum/virtual-app-set-state-commitment";
-import {
-  AppInstance,
-  ETHVirtualAppAgreementInstance,
-  StateChannel
-} from "../models";
+import { Opcode } from "../machine/enums";
 import {
   Context,
   InstallVirtualAppParams,
   ProtocolExecutionFlow,
   ProtocolParameters
-} from "../types";
-import { virtualChannelKey } from "../virtual-app-key";
-import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../xkeys";
+} from "../machine/types";
+import { virtualChannelKey } from "../machine/virtual-app-key";
+import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../machine/xkeys";
+import {
+  AppInstance,
+  ETHVirtualAppAgreementInstance,
+  StateChannel
+} from "../models";
 
 import { getChannelFromCounterparty } from "./utils/get-channel-from-counterparty";
 import { validateSignature } from "./utils/signature-validator";
diff --git a/packages/node/src/machine/protocol/install.ts b/packages/node/src/protocol/install.ts
similarity index 94%
rename from packages/node/src/machine/protocol/install.ts
rename to packages/node/src/protocol/install.ts
index 0faaed795..70fc10e2c 100644
--- a/packages/node/src/machine/protocol/install.ts
+++ b/packages/node/src/protocol/install.ts
@@ -1,11 +1,11 @@
 import { AssetType, NetworkContext } from "@counterfactual/types";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import { InstallCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
+import { Context, InstallParams, ProtocolParameters } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { AppInstance, StateChannel } from "../models";
-import { Context, InstallParams, ProtocolParameters } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
 import { validateSignature } from "./utils/signature-validator";
diff --git a/packages/node/src/machine/protocol/setup.ts b/packages/node/src/protocol/setup.ts
similarity index 93%
rename from packages/node/src/machine/protocol/setup.ts
rename to packages/node/src/protocol/setup.ts
index 33ad37c51..a79dbf8b2 100644
--- a/packages/node/src/machine/protocol/setup.ts
+++ b/packages/node/src/protocol/setup.ts
@@ -1,11 +1,11 @@
 import { AssetType, NetworkContext } from "@counterfactual/types";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import { SetupCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
+import { Context, ProtocolParameters, SetupParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models/state-channel";
-import { Context, ProtocolParameters, SetupParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
 import { validateSignature } from "./utils/signature-validator";
diff --git a/packages/node/src/machine/protocol/take-action.ts b/packages/node/src/protocol/take-action.ts
similarity index 93%
rename from packages/node/src/machine/protocol/take-action.ts
rename to packages/node/src/protocol/take-action.ts
index bedd49ddb..c1f048281 100644
--- a/packages/node/src/machine/protocol/take-action.ts
+++ b/packages/node/src/protocol/take-action.ts
@@ -1,11 +1,11 @@
 import { BaseProvider } from "ethers/providers";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode } from "../enums";
 import { SetStateCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode } from "../machine/enums";
+import { Context, ProtocolMessage, TakeActionParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models/state-channel";
-import { Context, ProtocolMessage, TakeActionParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { validateSignature } from "./utils/signature-validator";
 
diff --git a/packages/node/src/machine/protocol/uninstall-virtual-app.ts b/packages/node/src/protocol/uninstall-virtual-app.ts
similarity index 97%
rename from packages/node/src/machine/protocol/uninstall-virtual-app.ts
rename to packages/node/src/protocol/uninstall-virtual-app.ts
index f991664e1..0d2da2f80 100644
--- a/packages/node/src/machine/protocol/uninstall-virtual-app.ts
+++ b/packages/node/src/protocol/uninstall-virtual-app.ts
@@ -5,17 +5,17 @@ import {
 } from "@counterfactual/types";
 import { BaseProvider } from "ethers/providers";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode } from "../enums";
 import { UninstallCommitment, VirtualAppSetStateCommitment } from "../ethereum";
-import { StateChannel } from "../models";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode } from "../machine/enums";
 import {
   Context,
   ProtocolParameters,
   UninstallVirtualAppParams
-} from "../types";
-import { virtualChannelKey } from "../virtual-app-key";
-import { xkeyKthAddress } from "../xkeys";
+} from "../machine/types";
+import { virtualChannelKey } from "../machine/virtual-app-key";
+import { xkeyKthAddress } from "../machine/xkeys";
+import { StateChannel } from "../models";
 
 import { getChannelFromCounterparty } from "./utils/get-channel-from-counterparty";
 import { computeFreeBalanceIncrements } from "./utils/get-resolution-increments";
diff --git a/packages/node/src/machine/protocol/uninstall.ts b/packages/node/src/protocol/uninstall.ts
similarity index 95%
rename from packages/node/src/machine/protocol/uninstall.ts
rename to packages/node/src/protocol/uninstall.ts
index 2d4237bb3..c2811ad27 100644
--- a/packages/node/src/machine/protocol/uninstall.ts
+++ b/packages/node/src/protocol/uninstall.ts
@@ -1,12 +1,12 @@
 import { AssetType, ETHBucketAppState } from "@counterfactual/types";
 import { BaseProvider } from "ethers/providers";
 
-import { Protocol, ProtocolExecutionFlow } from "..";
-import { Opcode } from "../enums";
 import { UninstallCommitment } from "../ethereum";
+import { Protocol, ProtocolExecutionFlow } from "../machine";
+import { Opcode } from "../machine/enums";
+import { Context, ProtocolParameters, UninstallParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models";
-import { Context, ProtocolParameters, UninstallParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import {
   computeFreeBalanceIncrements,
diff --git a/packages/node/src/machine/protocol/update.ts b/packages/node/src/protocol/update.ts
similarity index 93%
rename from packages/node/src/machine/protocol/update.ts
rename to packages/node/src/protocol/update.ts
index 073144118..420d1c7a3 100644
--- a/packages/node/src/machine/protocol/update.ts
+++ b/packages/node/src/protocol/update.ts
@@ -1,11 +1,11 @@
 import { NetworkContext } from "@counterfactual/types";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import { SetStateCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
+import { Context, ProtocolParameters, UpdateParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models/state-channel";
-import { Context, ProtocolParameters, UpdateParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
 import { validateSignature } from "./utils/signature-validator";
diff --git a/packages/node/src/machine/protocol/utils/get-channel-from-counterparty.ts b/packages/node/src/protocol/utils/get-channel-from-counterparty.ts
similarity index 93%
rename from packages/node/src/machine/protocol/utils/get-channel-from-counterparty.ts
rename to packages/node/src/protocol/utils/get-channel-from-counterparty.ts
index 437cfca43..7945b2d50 100644
--- a/packages/node/src/machine/protocol/utils/get-channel-from-counterparty.ts
+++ b/packages/node/src/protocol/utils/get-channel-from-counterparty.ts
@@ -1,4 +1,4 @@
-import { StateChannel } from "../..";
+import { StateChannel } from "../../machine";
 
 /**
  * Gets a StateChannel from a map of them based on the counterparties
diff --git a/packages/node/src/machine/protocol/utils/get-resolution-increments.ts b/packages/node/src/protocol/utils/get-resolution-increments.ts
similarity index 100%
rename from packages/node/src/machine/protocol/utils/get-resolution-increments.ts
rename to packages/node/src/protocol/utils/get-resolution-increments.ts
diff --git a/packages/node/src/machine/protocol/utils/signature-forwarder.ts b/packages/node/src/protocol/utils/signature-forwarder.ts
similarity index 100%
rename from packages/node/src/machine/protocol/utils/signature-forwarder.ts
rename to packages/node/src/protocol/utils/signature-forwarder.ts
diff --git a/packages/node/src/machine/protocol/utils/signature-validator.ts b/packages/node/src/protocol/utils/signature-validator.ts
similarity index 100%
rename from packages/node/src/machine/protocol/utils/signature-validator.ts
rename to packages/node/src/protocol/utils/signature-validator.ts
diff --git a/packages/node/src/machine/protocol/withdraw-eth.ts b/packages/node/src/protocol/withdraw-eth.ts
similarity index 97%
rename from packages/node/src/machine/protocol/withdraw-eth.ts
rename to packages/node/src/protocol/withdraw-eth.ts
index 6cd539871..1726f90f7 100644
--- a/packages/node/src/machine/protocol/withdraw-eth.ts
+++ b/packages/node/src/protocol/withdraw-eth.ts
@@ -5,21 +5,21 @@ import {
 } from "@counterfactual/types";
 import { AddressZero, Zero } from "ethers/constants";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import {
   InstallCommitment,
   UninstallCommitment,
   WithdrawETHCommitment
 } from "../ethereum";
-import { AppInstance, StateChannel } from "../models";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
 import {
   Context,
   ProtocolMessage,
   ProtocolParameters,
   WithdrawParams
-} from "../types";
-import { xkeyKthAddress } from "../xkeys";
+} from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
+import { AppInstance, StateChannel } from "../models";
 
 import { validateSignature } from "./utils/signature-validator";
 
diff --git a/packages/node/test/machine/integration/eth-virtual-app-agreement-commitment.spec.ts b/packages/node/test/machine/integration/eth-virtual-app-agreement-commitment.spec.ts
index 04654e50e..b171ca5e4 100644
--- a/packages/node/test/machine/integration/eth-virtual-app-agreement-commitment.spec.ts
+++ b/packages/node/test/machine/integration/eth-virtual-app-agreement-commitment.spec.ts
@@ -8,10 +8,10 @@ import { AddressZero, HashZero } from "ethers/constants";
 import { JsonRpcProvider } from "ethers/providers";
 import { BigNumber, Interface, parseEther } from "ethers/utils";
 
-import { SetStateCommitment } from "../../../src/machine/ethereum";
-import { ETHVirtualAppAgreementCommitment } from "../../../src/machine/ethereum/eth-virtual-app-agreement-commitment";
-import { AppInstance, StateChannel } from "../../../src/machine/models";
+import { SetStateCommitment } from "../../../src/ethereum";
+import { ETHVirtualAppAgreementCommitment } from "../../../src/ethereum/eth-virtual-app-agreement-commitment";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine/xkeys";
+import { AppInstance, StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";
diff --git a/packages/node/test/machine/integration/install-then-set-state.spec.ts b/packages/node/test/machine/integration/install-then-set-state.spec.ts
index 4f89ac9de..d3df79967 100644
--- a/packages/node/test/machine/integration/install-then-set-state.spec.ts
+++ b/packages/node/test/machine/integration/install-then-set-state.spec.ts
@@ -7,12 +7,9 @@ import { AddressZero, WeiPerEther, Zero } from "ethers/constants";
 import { JsonRpcProvider } from "ethers/providers";
 import { Interface, keccak256, parseEther } from "ethers/utils";
 
-import {
-  InstallCommitment,
-  SetStateCommitment
-} from "../../../src/machine/ethereum";
-import { AppInstance, StateChannel } from "../../../src/machine/models";
+import { InstallCommitment, SetStateCommitment } from "../../../src/ethereum";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine/xkeys";
+import { AppInstance, StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";
diff --git a/packages/node/test/machine/integration/mininode.ts b/packages/node/test/machine/integration/mininode.ts
index 0c5b39d60..9a0e275b2 100644
--- a/packages/node/test/machine/integration/mininode.ts
+++ b/packages/node/test/machine/integration/mininode.ts
@@ -3,12 +3,12 @@ import { JsonRpcProvider } from "ethers/providers";
 import { SigningKey } from "ethers/utils";
 import { HDNode } from "ethers/utils/hdnode";
 
+import { EthereumCommitment } from "../../../src/ethereum/types";
 import {
   InstructionExecutor,
   Opcode,
   StateChannel
 } from "../../../src/machine";
-import { EthereumCommitment } from "../../../src/machine/ethereum/types";
 
 import { getRandomHDNodes } from "./random-signing-keys";
 
diff --git a/packages/node/test/machine/integration/set-state.spec.ts b/packages/node/test/machine/integration/set-state.spec.ts
index 679efd7fe..163d46497 100644
--- a/packages/node/test/machine/integration/set-state.spec.ts
+++ b/packages/node/test/machine/integration/set-state.spec.ts
@@ -3,9 +3,9 @@ import { AssetType, NetworkContext } from "@counterfactual/types";
 import { Contract, Wallet } from "ethers";
 import { AddressZero, WeiPerEther } from "ethers/constants";
 
+import { SetStateCommitment } from "../../../src/ethereum";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
-import { SetStateCommitment } from "../../../src/machine/ethereum";
-import { StateChannel } from "../../../src/machine/models";
+import { StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";
diff --git a/packages/node/test/machine/integration/setup-then-set-state.spec.ts b/packages/node/test/machine/integration/setup-then-set-state.spec.ts
index 4d1561b3b..6ba83b507 100644
--- a/packages/node/test/machine/integration/setup-then-set-state.spec.ts
+++ b/packages/node/test/machine/integration/setup-then-set-state.spec.ts
@@ -7,12 +7,9 @@ import { WeiPerEther, Zero } from "ethers/constants";
 import { JsonRpcProvider } from "ethers/providers";
 import { Interface, keccak256 } from "ethers/utils";
 
+import { SetStateCommitment, SetupCommitment } from "../../../src/ethereum";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
-import {
-  SetStateCommitment,
-  SetupCommitment
-} from "../../../src/machine/ethereum";
-import { StateChannel } from "../../../src/machine/models";
+import { StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";
diff --git a/packages/node/test/machine/integration/virtual-app-set-state-commitment.spec.ts b/packages/node/test/machine/integration/virtual-app-set-state-commitment.spec.ts
index c61fccd05..1a00f15ea 100644
--- a/packages/node/test/machine/integration/virtual-app-set-state-commitment.spec.ts
+++ b/packages/node/test/machine/integration/virtual-app-set-state-commitment.spec.ts
@@ -6,9 +6,9 @@ import { Contract, Wallet } from "ethers";
 import { AddressZero, WeiPerEther } from "ethers/constants";
 import { Signature, SigningKey } from "ethers/utils";
 
+import { VirtualAppSetStateCommitment } from "../../../src/ethereum/virtual-app-set-state-commitment";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
-import { VirtualAppSetStateCommitment } from "../../../src/machine/ethereum/virtual-app-set-state-commitment";
-import { AppInstance, StateChannel } from "../../../src/machine/models";
+import { AppInstance, StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";
diff --git a/packages/node/test/machine/unit/ethereum/eth-virtual-app-agreement-commitment.spec.ts b/packages/node/test/machine/unit/ethereum/eth-virtual-app-agreement-commitment.spec.ts
index 195ada954..66f36d186 100644
--- a/packages/node/test/machine/unit/ethereum/eth-virtual-app-agreement-commitment.spec.ts
+++ b/packages/node/test/machine/unit/ethereum/eth-virtual-app-agreement-commitment.spec.ts
@@ -12,10 +12,10 @@ import {
 } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
+import { ETHVirtualAppAgreementCommitment } from "../../../../src/ethereum/eth-virtual-app-agreement-commitment";
+import { Transaction } from "../../../../src/ethereum/types";
+import { decodeMultisendCalldata } from "../../../../src/ethereum/utils/multisend-decoder";
 import { StateChannel } from "../../../../src/machine";
-import { ETHVirtualAppAgreementCommitment } from "../../../../src/machine/ethereum/eth-virtual-app-agreement-commitment";
-import { Transaction } from "../../../../src/machine/ethereum/types";
-import { decodeMultisendCalldata } from "../../../../src/machine/ethereum/utils/multisend-decoder";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**
diff --git a/packages/node/test/machine/unit/ethereum/install-commitment.spec.ts b/packages/node/test/machine/unit/ethereum/install-commitment.spec.ts
index 4da6d3e84..5079410af 100644
--- a/packages/node/test/machine/unit/ethereum/install-commitment.spec.ts
+++ b/packages/node/test/machine/unit/ethereum/install-commitment.spec.ts
@@ -13,11 +13,11 @@ import {
 } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { InstallCommitment } from "../../../../src/machine/ethereum";
-import { MultisigTransaction } from "../../../../src/machine/ethereum/types";
-import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
-import { decodeMultisendCalldata } from "../../../../src/machine/ethereum/utils/multisend-decoder";
-import { AppInstance, StateChannel } from "../../../../src/machine/models";
+import { InstallCommitment } from "../../../../src/ethereum";
+import { MultisigTransaction } from "../../../../src/ethereum/types";
+import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
+import { decodeMultisendCalldata } from "../../../../src/ethereum/utils/multisend-decoder";
+import { AppInstance, StateChannel } from "../../../../src/models";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**
diff --git a/packages/node/test/machine/unit/ethereum/set-state-commitment.spec.ts b/packages/node/test/machine/unit/ethereum/set-state-commitment.spec.ts
index 84bed0e38..49a4b54fd 100644
--- a/packages/node/test/machine/unit/ethereum/set-state-commitment.spec.ts
+++ b/packages/node/test/machine/unit/ethereum/set-state-commitment.spec.ts
@@ -12,10 +12,10 @@ import {
   TransactionDescription
 } from "ethers/utils";
 
-import { SetStateCommitment } from "../../../../src/machine/ethereum";
-import { Transaction } from "../../../../src/machine/ethereum/types";
-import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
-import { AppInstance } from "../../../../src/machine/models";
+import { SetStateCommitment } from "../../../../src/ethereum";
+import { Transaction } from "../../../../src/ethereum/types";
+import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
+import { AppInstance } from "../../../../src/models";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**
diff --git a/packages/node/test/machine/unit/ethereum/setup-commitment.spec.ts b/packages/node/test/machine/unit/ethereum/setup-commitment.spec.ts
index cb38ee546..0f65f3b0e 100644
--- a/packages/node/test/machine/unit/ethereum/setup-commitment.spec.ts
+++ b/packages/node/test/machine/unit/ethereum/setup-commitment.spec.ts
@@ -10,10 +10,10 @@ import {
 } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { SetupCommitment } from "../../../../src/machine/ethereum";
-import { MultisigTransaction } from "../../../../src/machine/ethereum/types";
-import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
-import { StateChannel } from "../../../../src/machine/models";
+import { SetupCommitment } from "../../../../src/ethereum";
+import { MultisigTransaction } from "../../../../src/ethereum/types";
+import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
+import { StateChannel } from "../../../../src/models";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**
diff --git a/packages/node/test/machine/unit/ethereum/uninstall-commitment.spec.ts b/packages/node/test/machine/unit/ethereum/uninstall-commitment.spec.ts
index d56a1266d..06070bb62 100644
--- a/packages/node/test/machine/unit/ethereum/uninstall-commitment.spec.ts
+++ b/packages/node/test/machine/unit/ethereum/uninstall-commitment.spec.ts
@@ -15,10 +15,10 @@ import {
 } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { UninstallCommitment } from "../../../../src/machine/ethereum";
-import { MultisigTransaction } from "../../../../src/machine/ethereum/types";
-import { decodeMultisendCalldata } from "../../../../src/machine/ethereum/utils/multisend-decoder";
-import { StateChannel } from "../../../../src/machine/models";
+import { UninstallCommitment } from "../../../../src/ethereum";
+import { MultisigTransaction } from "../../../../src/ethereum/types";
+import { decodeMultisendCalldata } from "../../../../src/ethereum/utils/multisend-decoder";
+import { StateChannel } from "../../../../src/models";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**
diff --git a/packages/node/test/machine/unit/ethereum/virtual-app-set-state-commitment.spec.ts b/packages/node/test/machine/unit/ethereum/virtual-app-set-state-commitment.spec.ts
index ed2a43d94..ea82c2359 100644
--- a/packages/node/test/machine/unit/ethereum/virtual-app-set-state-commitment.spec.ts
+++ b/packages/node/test/machine/unit/ethereum/virtual-app-set-state-commitment.spec.ts
@@ -12,10 +12,10 @@ import {
   TransactionDescription
 } from "ethers/utils";
 
-import { VirtualAppSetStateCommitment } from "../../../../src/machine/ethereum";
-import { Transaction } from "../../../../src/machine/ethereum/types";
-import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
-import { AppInstance } from "../../../../src/machine/models";
+import { VirtualAppSetStateCommitment } from "../../../../src/ethereum";
+import { Transaction } from "../../../../src/ethereum/types";
+import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
+import { AppInstance } from "../../../../src/models";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**
diff --git a/packages/node/test/machine/unit/ethereum/withdraw-eth-commitment.spec.ts b/packages/node/test/machine/unit/ethereum/withdraw-eth-commitment.spec.ts
index 0bfdfcb9d..9abc4eb21 100644
--- a/packages/node/test/machine/unit/ethereum/withdraw-eth-commitment.spec.ts
+++ b/packages/node/test/machine/unit/ethereum/withdraw-eth-commitment.spec.ts
@@ -1,7 +1,7 @@
 import { bigNumberify, getAddress, hexlify, randomBytes } from "ethers/utils";
 
-import { WithdrawETHCommitment } from "../../../../src/machine/ethereum";
-import { Transaction } from "../../../../src/machine/ethereum/types";
+import { WithdrawETHCommitment } from "../../../../src/ethereum";
+import { Transaction } from "../../../../src/ethereum/types";
 
 /**
  * This test suite decodes a constructed WithdrawETHCommitment transaction object
diff --git a/packages/node/test/machine/unit/models/app-instance/app-instance.spec.ts b/packages/node/test/machine/unit/models/app-instance/app-instance.spec.ts
index 3237551a8..53ca22dfe 100644
--- a/packages/node/test/machine/unit/models/app-instance/app-instance.spec.ts
+++ b/packages/node/test/machine/unit/models/app-instance/app-instance.spec.ts
@@ -2,7 +2,7 @@ import { AssetType } from "@counterfactual/types";
 import { AddressZero } from "ethers/constants";
 import { bigNumberify, getAddress, hexlify, randomBytes } from "ethers/utils";
 
-import { AppInstance } from "../../../../../src/machine/models";
+import { AppInstance } from "../../../../../src/models";
 
 describe("AppInstance", () => {
   it("should be able to instantiate", () => {
diff --git a/packages/node/test/machine/unit/models/state-channel/install.spec.ts b/packages/node/test/machine/unit/models/state-channel/install.spec.ts
index 43310f1b8..404ddf3d4 100644
--- a/packages/node/test/machine/unit/models/state-channel/install.spec.ts
+++ b/packages/node/test/machine/unit/models/state-channel/install.spec.ts
@@ -3,8 +3,8 @@ import { AddressZero, WeiPerEther, Zero } from "ethers/constants";
 import { bigNumberify, getAddress, hexlify, randomBytes } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { AppInstance, StateChannel } from "../../../../../src/machine/models";
 import { xkeyKthAddress } from "../../../../../src/machine/xkeys";
+import { AppInstance, StateChannel } from "../../../../../src/models";
 import { generateRandomNetworkContext } from "../../../mocks";
 
 describe("StateChannel::uninstallApp", () => {
diff --git a/packages/node/test/machine/unit/models/state-channel/set-state.spec.ts b/packages/node/test/machine/unit/models/state-channel/set-state.spec.ts
index 700fcd87f..4d1106de5 100644
--- a/packages/node/test/machine/unit/models/state-channel/set-state.spec.ts
+++ b/packages/node/test/machine/unit/models/state-channel/set-state.spec.ts
@@ -3,8 +3,8 @@ import { AddressZero, Zero } from "ethers/constants";
 import { bigNumberify, getAddress, hexlify, randomBytes } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { AppInstance, StateChannel } from "../../../../../src/machine/models";
 import { xkeyKthAddress } from "../../../../../src/machine/xkeys";
+import { AppInstance, StateChannel } from "../../../../../src/models";
 import { generateRandomNetworkContext } from "../../../mocks";
 
 const APP_STATE = {
diff --git a/packages/node/test/machine/unit/models/state-channel/setup-channel.spec.ts b/packages/node/test/machine/unit/models/state-channel/setup-channel.spec.ts
index 66ee6f878..c65a4356d 100644
--- a/packages/node/test/machine/unit/models/state-channel/setup-channel.spec.ts
+++ b/packages/node/test/machine/unit/models/state-channel/setup-channel.spec.ts
@@ -3,7 +3,7 @@ import { Zero } from "ethers/constants";
 import { getAddress, hexlify, randomBytes } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { AppInstance, StateChannel } from "../../../../../src/machine/models";
+import { AppInstance, StateChannel } from "../../../../../src/models";
 import { generateRandomNetworkContext } from "../../../mocks";
 
 describe("StateChannel::setupChannel", () => {
diff --git a/packages/node/test/machine/unit/models/state-channel/state-channel.spec.ts b/packages/node/test/machine/unit/models/state-channel/state-channel.spec.ts
index ecf33474f..0acc096be 100644
--- a/packages/node/test/machine/unit/models/state-channel/state-channel.spec.ts
+++ b/packages/node/test/machine/unit/models/state-channel/state-channel.spec.ts
@@ -1,7 +1,7 @@
 import { getAddress, hexlify, randomBytes } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { StateChannel } from "../../../../../src/machine/models";
+import { StateChannel } from "../../../../../src/models";
 
 describe("StateChannel", () => {
   it("should be able to instantiate", () => {
diff --git a/packages/node/test/machine/unit/models/state-channel/uninstall-app.spec.ts b/packages/node/test/machine/unit/models/state-channel/uninstall-app.spec.ts
index 2f16f75ca..6b00d5f49 100644
--- a/packages/node/test/machine/unit/models/state-channel/uninstall-app.spec.ts
+++ b/packages/node/test/machine/unit/models/state-channel/uninstall-app.spec.ts
@@ -3,8 +3,8 @@ import { AddressZero, Zero } from "ethers/constants";
 import { bigNumberify, getAddress, hexlify, randomBytes } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { AppInstance, StateChannel } from "../../../../../src/machine/models";
 import { xkeyKthAddress } from "../../../../../src/machine/xkeys";
+import { AppInstance, StateChannel } from "../../../../../src/models";
 import { generateRandomNetworkContext } from "../../../mocks";
 
 describe("StateChannel::uninstallApp", () => {
diff --git a/packages/node/test/machine/unit/protocol/signature-validator.spec.ts b/packages/node/test/machine/unit/protocol/signature-validator.spec.ts
index 2385f005b..e029047a4 100644
--- a/packages/node/test/machine/unit/protocol/signature-validator.spec.ts
+++ b/packages/node/test/machine/unit/protocol/signature-validator.spec.ts
@@ -7,8 +7,8 @@ import {
   SigningKey
 } from "ethers/utils";
 
-import { EthereumCommitment } from "../../../../src/machine/ethereum/types";
-import { validateSignature } from "../../../../src/machine/protocol/utils/signature-validator";
+import { EthereumCommitment } from "../../../../src/ethereum/types";
+import { validateSignature } from "../../../../src/protocol/utils/signature-validator";
 
 describe("Signature Validator Helper", () => {
   let signer: SigningKey;