diff --git a/build.gradle b/build.gradle
index 0cdffbbf05..d1882cb006 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,7 +125,8 @@ dependencies {
     runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
 
     // For the buildCordappDependenciesJar task
-    runtime project(':client')
+    runtime project(':client:jfx')
+    runtime project(':client:mock')
     runtime project(':core')
     runtime project(':finance')
     runtime project(':node:webserver')
@@ -197,7 +198,7 @@ bintrayConfig {
     projectUrl = 'https://github.com/corda/corda'
     gpgSign = true
     gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
-    publications = ['client', 'core', 'corda', 'corda-webserver', 'finance', 'node', 'node-api', 'node-schemas', 'test-utils', 'jackson', 'webserver']
+    publications = ['jfx', 'mock', 'core', 'corda', 'corda-webserver', 'finance', 'node', 'node-api', 'node-schemas', 'test-utils', 'jackson', 'webserver']
     license {
         name = 'Apache-2.0'
         url = 'https://www.apache.org/licenses/LICENSE-2.0'
@@ -216,7 +217,7 @@ dokka {
     moduleName = 'corda'
     outputDirectory = 'docs/build/html/api/kotlin'
     processConfigurations = ['compile']
-    sourceDirs = files('core/src/main/kotlin', 'client/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
+    sourceDirs = files('core/src/main/kotlin', 'client/jfx/src/main/kotlin', 'client/mock/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
 }
 
 task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
@@ -224,7 +225,7 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
     outputFormat = "javadoc"
     outputDirectory = 'docs/build/html/api/javadoc'
     processConfigurations = ['compile']
-    sourceDirs = files('core/src/main/kotlin', 'client/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
+    sourceDirs = files('core/src/main/kotlin', 'client/jfx/src/main/kotlin', 'client/mock/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
 }
 
 task apidocs(dependsOn: ['dokka', 'dokkaJavadoc'])
diff --git a/client/build.gradle b/client/jfx/build.gradle
similarity index 96%
rename from client/build.gradle
rename to client/jfx/build.gradle
index b7f126651f..90b36527e0 100644
--- a/client/build.gradle
+++ b/client/jfx/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'kotlin'
 apply plugin: 'net.corda.plugins.quasar-utils'
 apply plugin: 'net.corda.plugins.publish-utils'
 
-description 'Corda client modules'
+description 'Corda client JavaFX modules'
 
 repositories {
     mavenLocal()
@@ -35,7 +35,7 @@ sourceSets {
     }
     test {
         resources {
-            srcDir "../config/test"
+            srcDir "../../config/test"
         }
     }
 }
diff --git a/client/src/integration-test/kotlin/net/corda/client/CordaRPCClientTest.kt b/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/CordaRPCClientTest.kt
similarity index 99%
rename from client/src/integration-test/kotlin/net/corda/client/CordaRPCClientTest.kt
rename to client/jfx/src/integration-test/kotlin/net/corda/client/jfx/CordaRPCClientTest.kt
index 4b071b2c87..37b99d0c79 100644
--- a/client/src/integration-test/kotlin/net/corda/client/CordaRPCClientTest.kt
+++ b/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/CordaRPCClientTest.kt
@@ -1,4 +1,4 @@
-package net.corda.client
+package net.corda.client.jfx
 
 import net.corda.core.contracts.DOLLARS
 import net.corda.core.flows.FlowException
diff --git a/client/src/integration-test/kotlin/net/corda/client/NodeMonitorModelTest.kt b/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
similarity index 98%
rename from client/src/integration-test/kotlin/net/corda/client/NodeMonitorModelTest.kt
rename to client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
index 54b0678774..fff3c09523 100644
--- a/client/src/integration-test/kotlin/net/corda/client/NodeMonitorModelTest.kt
+++ b/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
@@ -1,7 +1,7 @@
-package net.corda.client
+package net.corda.client.jfx
 
-import net.corda.client.model.NodeMonitorModel
-import net.corda.client.model.ProgressTrackingEvent
+import net.corda.client.jfx.model.NodeMonitorModel
+import net.corda.client.jfx.model.ProgressTrackingEvent
 import net.corda.core.bufferUntilSubscribed
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.DOLLARS
@@ -21,7 +21,6 @@ import net.corda.core.transactions.SignedTransaction
 import net.corda.flows.CashExitFlow
 import net.corda.flows.CashIssueFlow
 import net.corda.flows.CashPaymentFlow
-import net.corda.node.driver.DriverBasedTest
 import net.corda.node.driver.driver
 import net.corda.node.services.User
 import net.corda.node.services.network.NetworkMapService
@@ -29,6 +28,7 @@ import net.corda.node.services.startFlowPermission
 import net.corda.node.services.transactions.SimpleNotaryService
 import net.corda.testing.expect
 import net.corda.testing.expectEvents
+import net.corda.testing.node.DriverBasedTest
 import net.corda.testing.sequence
 import org.junit.Test
 import rx.Observable
diff --git a/client/src/main/kotlin/net/corda/client/model/ContractStateModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/ContractStateModel.kt
similarity index 94%
rename from client/src/main/kotlin/net/corda/client/model/ContractStateModel.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/model/ContractStateModel.kt
index 33ec550322..4ed8c99ca5 100644
--- a/client/src/main/kotlin/net/corda/client/model/ContractStateModel.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/ContractStateModel.kt
@@ -1,10 +1,10 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
 import kotlinx.support.jdk8.collections.removeIf
-import net.corda.client.fxutils.fold
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.fold
+import net.corda.client.jfx.utils.map
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateAndRef
diff --git a/client/src/main/kotlin/net/corda/client/model/ExchangeRateModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/ExchangeRateModel.kt
similarity index 95%
rename from client/src/main/kotlin/net/corda/client/model/ExchangeRateModel.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/model/ExchangeRateModel.kt
index a3108649fb..243d87843e 100644
--- a/client/src/main/kotlin/net/corda/client/model/ExchangeRateModel.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/ExchangeRateModel.kt
@@ -1,4 +1,4 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.value.ObservableValue
diff --git a/client/src/main/kotlin/net/corda/client/model/Models.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/Models.kt
similarity index 99%
rename from client/src/main/kotlin/net/corda/client/model/Models.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/model/Models.kt
index 1d2b6ab460..57f939e672 100644
--- a/client/src/main/kotlin/net/corda/client/model/Models.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/Models.kt
@@ -1,4 +1,4 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.property.ObjectProperty
 import javafx.beans.value.ObservableValue
diff --git a/client/src/main/kotlin/net/corda/client/model/NetworkIdentityModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NetworkIdentityModel.kt
similarity index 90%
rename from client/src/main/kotlin/net/corda/client/model/NetworkIdentityModel.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/model/NetworkIdentityModel.kt
index ff91f08a32..9c3b1d408b 100644
--- a/client/src/main/kotlin/net/corda/client/model/NetworkIdentityModel.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NetworkIdentityModel.kt
@@ -1,13 +1,13 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.value.ObservableValue
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
 import kotlinx.support.jdk8.collections.removeIf
-import net.corda.client.fxutils.firstOrDefault
-import net.corda.client.fxutils.firstOrNullObservable
-import net.corda.client.fxutils.fold
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.firstOrDefault
+import net.corda.client.jfx.utils.firstOrNullObservable
+import net.corda.client.jfx.utils.fold
+import net.corda.client.jfx.utils.map
 import net.corda.core.crypto.CompositeKey
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.NetworkMapCache.MapChange
@@ -48,4 +48,4 @@ class NetworkIdentityModel {
     fun lookup(publicKey: PublicKey): ObservableValue<NodeInfo?> = parties.firstOrDefault(notaries.firstOrNullObservable { it.notaryIdentity.owningKey.keys.any { it == publicKey } }) {
         it.legalIdentity.owningKey.keys.any { it == publicKey }
     }
-}
\ No newline at end of file
+}
diff --git a/client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt
index 4974578ff6..24b5611752 100644
--- a/client/src/main/kotlin/net/corda/client/model/NodeMonitorModel.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt
@@ -1,8 +1,7 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import com.google.common.net.HostAndPort
 import javafx.beans.property.SimpleObjectProperty
-import net.corda.nodeapi.config.SSLConfiguration
 import net.corda.core.flows.StateMachineRunId
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.StateMachineInfo
@@ -97,4 +96,4 @@ class NodeMonitorModel {
 
         proxyObservable.set(proxy)
     }
-}
\ No newline at end of file
+}
diff --git a/client/src/main/kotlin/net/corda/client/model/TransactionDataModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/model/TransactionDataModel.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt
index 3a6c9eddd7..4a709616f1 100644
--- a/client/src/main/kotlin/net/corda/client/model/TransactionDataModel.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt
@@ -1,11 +1,11 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.value.ObservableValue
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
 import javafx.collections.ObservableMap
-import net.corda.client.fxutils.*
+import net.corda.client.jfx.utils.*
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/AggregatedList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AggregatedList.kt
similarity index 99%
rename from client/src/main/kotlin/net/corda/client/fxutils/AggregatedList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AggregatedList.kt
index 99f7f28c49..801def3027 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/AggregatedList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AggregatedList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ListChangeListener
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/AmountBindings.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AmountBindings.kt
similarity index 95%
rename from client/src/main/kotlin/net/corda/client/fxutils/AmountBindings.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AmountBindings.kt
index cbfc7020c4..5b88591d9e 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/AmountBindings.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AmountBindings.kt
@@ -1,10 +1,10 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.binding.Bindings
 import javafx.beans.value.ObservableValue
 import javafx.collections.ObservableList
 import kotlinx.support.jdk8.collections.stream
-import net.corda.client.model.ExchangeRate
+import net.corda.client.jfx.model.ExchangeRate
 import net.corda.core.contracts.Amount
 import org.fxmisc.easybind.EasyBind
 import java.util.*
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/AssociatedList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AssociatedList.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/fxutils/AssociatedList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AssociatedList.kt
index d610f43d97..6bac0fcb47 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/AssociatedList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AssociatedList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.ListChangeListener
 import javafx.collections.ObservableList
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/ChosenList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ChosenList.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/fxutils/ChosenList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ChosenList.kt
index 32a618b851..77447feb58 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/ChosenList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ChosenList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.Observable
 import javafx.beans.value.ObservableValue
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/ConcatenatedList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ConcatenatedList.kt
similarity index 99%
rename from client/src/main/kotlin/net/corda/client/fxutils/ConcatenatedList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ConcatenatedList.kt
index 280f8293d0..d6f665d397 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/ConcatenatedList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ConcatenatedList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import co.paralleluniverse.common.util.VisibleForTesting
 import javafx.collections.ListChangeListener
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/FlattenedList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/FlattenedList.kt
similarity index 99%
rename from client/src/main/kotlin/net/corda/client/fxutils/FlattenedList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/FlattenedList.kt
index 35531f8ede..8e9bcf7d98 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/FlattenedList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/FlattenedList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.value.ChangeListener
 import javafx.beans.value.ObservableValue
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/LeftOuterJoinedMap.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMap.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/fxutils/LeftOuterJoinedMap.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMap.kt
index 4e20966128..3a2be71518 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/LeftOuterJoinedMap.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMap.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.value.ObservableValue
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/MapValuesList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MapValuesList.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/fxutils/MapValuesList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MapValuesList.kt
index 90e3cef0c2..37c0963f0d 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/MapValuesList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MapValuesList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.MapChangeListener
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/MappedList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MappedList.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/fxutils/MappedList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MappedList.kt
index 9747b92b86..3578646ccc 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/MappedList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MappedList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.ListChangeListener
 import javafx.collections.ObservableList
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/ObservableFold.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableFold.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/fxutils/ObservableFold.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableFold.kt
index d9c34b11dd..aa5187aa3e 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/ObservableFold.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableFold.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.application.Platform
 import javafx.beans.property.SimpleObjectProperty
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/ObservableUtilities.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableUtilities.kt
similarity index 99%
rename from client/src/main/kotlin/net/corda/client/fxutils/ObservableUtilities.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableUtilities.kt
index 1cabac56a2..b39cc8a8d0 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/ObservableUtilities.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableUtilities.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.binding.Bindings
 import javafx.beans.binding.BooleanBinding
@@ -306,4 +306,4 @@ fun <A> ObservableList<A>.firstOrDefault(default: ObservableValue<A?>, predicate
  */
 fun <A> ObservableList<A>.firstOrNullObservable(predicate: (A) -> Boolean): ObservableValue<A?> {
     return Bindings.createObjectBinding({ this.firstOrNull(predicate) }, arrayOf(this))
-}
\ No newline at end of file
+}
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/ReadOnlyBackedObservableMapBase.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReadOnlyBackedObservableMapBase.kt
similarity index 99%
rename from client/src/main/kotlin/net/corda/client/fxutils/ReadOnlyBackedObservableMapBase.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReadOnlyBackedObservableMapBase.kt
index 74020206fd..30c3c334b4 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/ReadOnlyBackedObservableMapBase.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReadOnlyBackedObservableMapBase.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import com.sun.javafx.collections.MapListenerHelper
 import javafx.beans.InvalidationListener
diff --git a/client/src/main/kotlin/net/corda/client/fxutils/ReplayedList.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReplayedList.kt
similarity index 98%
rename from client/src/main/kotlin/net/corda/client/fxutils/ReplayedList.kt
rename to client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReplayedList.kt
index 162107b5a0..61ca306485 100644
--- a/client/src/main/kotlin/net/corda/client/fxutils/ReplayedList.kt
+++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReplayedList.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.ListChangeListener
 import javafx.collections.ObservableList
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/AggregatedListTest.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AggregatedListTest.kt
similarity index 98%
rename from client/src/test/kotlin/net/corda/client/fxutils/AggregatedListTest.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AggregatedListTest.kt
index 19f457d0a8..b04817f62d 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/AggregatedListTest.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AggregatedListTest.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/AssociatedListTest.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AssociatedListTest.kt
similarity index 98%
rename from client/src/test/kotlin/net/corda/client/fxutils/AssociatedListTest.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AssociatedListTest.kt
index 5feac46a2d..052b422c01 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/AssociatedListTest.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AssociatedListTest.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/ConcatenatedListTest.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ConcatenatedListTest.kt
similarity index 99%
rename from client/src/test/kotlin/net/corda/client/fxutils/ConcatenatedListTest.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ConcatenatedListTest.kt
index 001d567ac7..effbed01a7 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/ConcatenatedListTest.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ConcatenatedListTest.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/FlattenedListTest.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/FlattenedListTest.kt
similarity index 99%
rename from client/src/test/kotlin/net/corda/client/fxutils/FlattenedListTest.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/FlattenedListTest.kt
index d972c68a5b..36b55233c7 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/FlattenedListTest.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/FlattenedListTest.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.collections.FXCollections
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/LeftOuterJoinedMapTest.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMapTest.kt
similarity index 99%
rename from client/src/test/kotlin/net/corda/client/fxutils/LeftOuterJoinedMapTest.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMapTest.kt
index eb6bbc18da..5a1d8c2937 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/LeftOuterJoinedMapTest.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMapTest.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/MappedListTest.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/MappedListTest.kt
similarity index 98%
rename from client/src/test/kotlin/net/corda/client/fxutils/MappedListTest.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/MappedListTest.kt
index aa9551aef3..be8783ef97 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/MappedListTest.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/MappedListTest.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/ReplayedListTest.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedListTest.kt
similarity index 93%
rename from client/src/test/kotlin/net/corda/client/fxutils/ReplayedListTest.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedListTest.kt
index 4857e01207..b645221788 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/ReplayedListTest.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedListTest.kt
@@ -1,13 +1,14 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
+import javafx.collections.ObservableList
 import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertEquals
 
 class ReplayedListTest {
 
-    var sourceList = FXCollections.observableArrayList(1234)
+    var sourceList: ObservableList<Int> = FXCollections.observableArrayList(1234)
     var replayedList = ReplayedList(sourceList)
 
     @Before
diff --git a/client/src/test/kotlin/net/corda/client/fxutils/ReplayedMap.kt b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedMap.kt
similarity index 95%
rename from client/src/test/kotlin/net/corda/client/fxutils/ReplayedMap.kt
rename to client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedMap.kt
index afe3d3ce61..1b1e69daaa 100644
--- a/client/src/test/kotlin/net/corda/client/fxutils/ReplayedMap.kt
+++ b/client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedMap.kt
@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.MapChangeListener
 import javafx.collections.ObservableMap
diff --git a/client/mock/build.gradle b/client/mock/build.gradle
new file mode 100644
index 0000000000..ec64233971
--- /dev/null
+++ b/client/mock/build.gradle
@@ -0,0 +1,44 @@
+apply plugin: 'kotlin'
+apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'net.corda.plugins.publish-utils'
+
+description 'Corda client mock modules'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url 'http://oss.sonatype.org/content/repositories/snapshots'
+    }
+    jcenter()
+    maven {
+        url 'https://dl.bintray.com/kotlin/exposed'
+    }
+}
+
+//noinspection GroovyAssignabilityCheck
+configurations {
+    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
+    runtime.exclude module: 'isolated'
+}
+
+sourceSets {
+    test {
+        resources {
+            srcDir "../../config/test"
+        }
+    }
+}
+
+// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
+// build/reports/project/dependencies/index.html for green highlighted parts of the tree.
+
+dependencies {
+    compile project(":node")
+
+    // Unit testing helpers.
+    testCompile "junit:junit:$junit_version"
+    testCompile "org.assertj:assertj-core:${assertj_version}"
+
+    testCompile project(':test-utils')
+}
diff --git a/client/src/main/kotlin/net/corda/client/mock/EventGenerator.kt b/client/mock/src/main/kotlin/net/corda/client/mock/EventGenerator.kt
similarity index 99%
rename from client/src/main/kotlin/net/corda/client/mock/EventGenerator.kt
rename to client/mock/src/main/kotlin/net/corda/client/mock/EventGenerator.kt
index 24ea8a09f6..99eed3a4e0 100644
--- a/client/src/main/kotlin/net/corda/client/mock/EventGenerator.kt
+++ b/client/mock/src/main/kotlin/net/corda/client/mock/EventGenerator.kt
@@ -99,4 +99,4 @@ class EventGenerator(
     val bankOfCordaIssueGenerator = Generator.frequency(
             0.6 to issueCashGenerator
     )
-}
\ No newline at end of file
+}
diff --git a/client/src/main/kotlin/net/corda/client/mock/Generator.kt b/client/mock/src/main/kotlin/net/corda/client/mock/Generator.kt
similarity index 100%
rename from client/src/main/kotlin/net/corda/client/mock/Generator.kt
rename to client/mock/src/main/kotlin/net/corda/client/mock/Generator.kt
diff --git a/client/src/main/kotlin/net/corda/client/mock/Generators.kt b/client/mock/src/main/kotlin/net/corda/client/mock/Generators.kt
similarity index 100%
rename from client/src/main/kotlin/net/corda/client/mock/Generators.kt
rename to client/mock/src/main/kotlin/net/corda/client/mock/Generators.kt
diff --git a/docs/source/example-code/build.gradle b/docs/source/example-code/build.gradle
index fd39861c92..be45ebc6d9 100644
--- a/docs/source/example-code/build.gradle
+++ b/docs/source/example-code/build.gradle
@@ -40,7 +40,7 @@ compileTestJava.dependsOn tasks.getByPath(':node:capsule:buildCordaJAR')
 
 dependencies {
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
     testCompile project(':test-utils')
 
     compile "org.graphstream:gs-core:1.3"
diff --git a/node/build.gradle b/node/build.gradle
index 570401f1c5..d9adff9781 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -126,7 +126,7 @@ dependencies {
     testCompile "com.pholser:junit-quickcheck-core:$quickcheck_version"
     testCompile "com.nhaarman:mockito-kotlin:1.1.0"
     testCompile project(':test-utils')
-    testCompile project(':client')
+    testCompile project(':client:jfx')
     testCompile project(':core')
 
     // For H2 database support in persistence
diff --git a/node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt b/node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
index 5dbd4cf616..7e199238ce 100644
--- a/node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
@@ -13,12 +13,12 @@ import net.corda.core.node.NodeInfo
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.flows.CashIssueFlow
 import net.corda.flows.CashPaymentFlow
-import net.corda.node.driver.DriverBasedTest
 import net.corda.node.driver.NodeHandle
 import net.corda.node.driver.driver
 import net.corda.node.services.transactions.RaftValidatingNotaryService
 import net.corda.testing.expect
 import net.corda.testing.expectEvents
+import net.corda.testing.node.DriverBasedTest
 import net.corda.testing.replicate
 import org.junit.Test
 import rx.Observable
diff --git a/samples/bank-of-corda-demo/build.gradle b/samples/bank-of-corda-demo/build.gradle
index f8c5099ba2..d4988cdf0e 100644
--- a/samples/bank-of-corda-demo/build.gradle
+++ b/samples/bank-of-corda-demo/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
     runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
     compile project(':node')
     compile project(':finance')
     compile project(':test-utils')
diff --git a/samples/raft-notary-demo/build.gradle b/samples/raft-notary-demo/build.gradle
index 76c2cc41bf..eefc6576c2 100644
--- a/samples/raft-notary-demo/build.gradle
+++ b/samples/raft-notary-demo/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
     runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
     compile project(':node')
     compile project(':test-utils')
 
diff --git a/settings.gradle b/settings.gradle
index c599281ae4..0368341586 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,8 +10,9 @@ include 'node'
 include 'node:capsule'
 include 'node:webserver'
 include 'node:webserver:webcapsule'
-include 'client'
 include 'client:jackson'
+include 'client:jfx'
+include 'client:mock'
 include 'experimental'
 include 'experimental:sandbox'
 include 'test-utils'
diff --git a/node/src/main/kotlin/net/corda/node/driver/DriverBasedTest.kt b/test-utils/src/main/kotlin/net/corda/testing/node/DriverBasedTest.kt
similarity index 91%
rename from node/src/main/kotlin/net/corda/node/driver/DriverBasedTest.kt
rename to test-utils/src/main/kotlin/net/corda/testing/node/DriverBasedTest.kt
index 63d8bc4d33..5421dfa7b3 100644
--- a/node/src/main/kotlin/net/corda/node/driver/DriverBasedTest.kt
+++ b/test-utils/src/main/kotlin/net/corda/testing/node/DriverBasedTest.kt
@@ -1,5 +1,6 @@
-package net.corda.node.driver
+package net.corda.testing.node
 
+import net.corda.node.driver.DriverDSLExposedInterface
 import org.junit.After
 import org.junit.Before
 import java.util.concurrent.CountDownLatch
diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle
index 4f19800bb8..694684885d 100644
--- a/tools/explorer/build.gradle
+++ b/tools/explorer/build.gradle
@@ -40,7 +40,8 @@ dependencies {
 
     // Corda Core: Data structures and basic types needed to work with Corda.
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
+    compile project(':client:mock')
     compile project(':node')
     compile project(':finance')
 
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt
index 52401b8417..4bb256cc72 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt
@@ -9,9 +9,9 @@ import javafx.scene.image.Image
 import javafx.stage.Stage
 import jfxtras.resources.JFXtrasFontRoboto
 import joptsimple.OptionParser
+import net.corda.client.jfx.model.Models
+import net.corda.client.jfx.model.observableValue
 import net.corda.client.mock.EventGenerator
-import net.corda.client.model.Models
-import net.corda.client.model.observableValue
 import net.corda.core.contracts.GBP
 import net.corda.core.contracts.USD
 import net.corda.core.node.services.ServiceInfo
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/model/IssuerModel.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/model/IssuerModel.kt
index 3ecbb92c04..a37da6bb9f 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/model/IssuerModel.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/model/IssuerModel.kt
@@ -1,11 +1,11 @@
 package net.corda.explorer.model
 
 import javafx.collections.ObservableList
-import net.corda.client.fxutils.ChosenList
-import net.corda.client.fxutils.map
-import net.corda.client.model.NetworkIdentityModel
-import net.corda.client.model.observableList
-import net.corda.client.model.observableValue
+import net.corda.client.jfx.utils.ChosenList
+import net.corda.client.jfx.utils.map
+import net.corda.client.jfx.model.NetworkIdentityModel
+import net.corda.client.jfx.model.observableList
+import net.corda.client.jfx.model.observableValue
 import net.corda.core.contracts.currency
 import net.corda.core.node.NodeInfo
 import tornadofx.observable
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/model/ReportingCurrencyModel.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/model/ReportingCurrencyModel.kt
index 9ae977d5cc..88ef3fa9b2 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/model/ReportingCurrencyModel.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/model/ReportingCurrencyModel.kt
@@ -1,10 +1,10 @@
 package net.corda.explorer.model
 
 import javafx.beans.value.ObservableValue
-import net.corda.client.fxutils.AmountBindings
-import net.corda.client.model.ExchangeRate
-import net.corda.client.model.ExchangeRateModel
-import net.corda.client.model.observableValue
+import net.corda.client.jfx.utils.AmountBindings
+import net.corda.client.jfx.model.ExchangeRate
+import net.corda.client.jfx.model.ExchangeRateModel
+import net.corda.client.jfx.model.observableValue
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.CHF
 import net.corda.core.contracts.GBP
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/Dashboard.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/Dashboard.kt
index bbbbefa9c4..eabdc07875 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/Dashboard.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/Dashboard.kt
@@ -8,10 +8,10 @@ import javafx.scene.Parent
 import javafx.scene.control.TitledPane
 import javafx.scene.input.MouseButton
 import javafx.scene.layout.TilePane
-import net.corda.client.fxutils.concatenate
-import net.corda.client.fxutils.map
-import net.corda.client.model.observableList
-import net.corda.client.model.writableValue
+import net.corda.client.jfx.model.observableList
+import net.corda.client.jfx.model.writableValue
+import net.corda.client.jfx.utils.concatenate
+import net.corda.client.jfx.utils.map
 import net.corda.explorer.model.CordaView
 import net.corda.explorer.model.CordaViewModel
 
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/GuiUtilities.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/GuiUtilities.kt
index 493197af17..9239ed810d 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/GuiUtilities.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/GuiUtilities.kt
@@ -10,9 +10,9 @@ import javafx.scene.layout.GridPane
 import javafx.scene.layout.Priority
 import javafx.scene.text.TextAlignment
 import javafx.util.StringConverter
-import net.corda.client.fxutils.map
-import net.corda.client.model.Models
-import net.corda.client.model.NetworkIdentityModel
+import net.corda.client.jfx.model.Models
+import net.corda.client.jfx.model.NetworkIdentityModel
+import net.corda.client.jfx.utils.map
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.crypto.AnonymousParty
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/LoginView.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/LoginView.kt
index 9b282c93b6..df873028a2 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/LoginView.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/LoginView.kt
@@ -3,8 +3,8 @@ package net.corda.explorer.views
 import com.google.common.net.HostAndPort
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.scene.control.*
-import net.corda.client.model.NodeMonitorModel
-import net.corda.client.model.objectProperty
+import net.corda.client.jfx.model.NodeMonitorModel
+import net.corda.client.jfx.model.objectProperty
 import net.corda.explorer.model.SettingsModel
 import org.controlsfx.dialog.ExceptionDialog
 import tornadofx.*
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/MainView.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/MainView.kt
index 7903212b90..cd75cb262f 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/MainView.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/MainView.kt
@@ -17,12 +17,12 @@ import javafx.scene.text.Font
 import javafx.scene.text.TextAlignment
 import javafx.stage.Stage
 import javafx.stage.WindowEvent
-import net.corda.client.fxutils.ChosenList
-import net.corda.client.fxutils.map
-import net.corda.client.model.NetworkIdentityModel
-import net.corda.client.model.objectProperty
-import net.corda.client.model.observableList
-import net.corda.client.model.observableValue
+import net.corda.client.jfx.model.NetworkIdentityModel
+import net.corda.client.jfx.model.objectProperty
+import net.corda.client.jfx.model.observableList
+import net.corda.client.jfx.model.observableValue
+import net.corda.client.jfx.utils.ChosenList
+import net.corda.client.jfx.utils.map
 import net.corda.explorer.model.CordaViewModel
 import tornadofx.*
 
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/Network.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/Network.kt
index 4b6d92ee8c..2ed45d90ec 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/Network.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/Network.kt
@@ -23,8 +23,8 @@ import javafx.scene.shape.Line
 import javafx.scene.text.Font
 import javafx.scene.text.FontWeight
 import javafx.util.Duration
-import net.corda.client.fxutils.*
-import net.corda.client.model.*
+import net.corda.client.jfx.model.*
+import net.corda.client.jfx.utils.*
 import net.corda.core.contracts.ContractState
 import net.corda.core.crypto.Party
 import net.corda.core.node.NodeInfo
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt
index 588d7e1f6b..ac3e49afbb 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt
@@ -14,8 +14,8 @@ import javafx.scene.control.ListCell
 import javafx.scene.control.TextField
 import javafx.scene.input.MouseButton
 import javafx.scene.input.MouseEvent
-import net.corda.client.fxutils.ChosenList
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.ChosenList
+import net.corda.client.jfx.utils.map
 import tornadofx.UIComponent
 import tornadofx.observable
 
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/Settings.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/Settings.kt
index ece2b5dd61..6bfcd3b826 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/Settings.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/Settings.kt
@@ -8,9 +8,9 @@ import javafx.scene.control.CheckBox
 import javafx.scene.control.ComboBox
 import javafx.scene.control.Label
 import javafx.scene.control.TextField
-import net.corda.client.fxutils.map
-import net.corda.client.model.objectProperty
-import net.corda.client.model.observableList
+import net.corda.client.jfx.model.objectProperty
+import net.corda.client.jfx.model.observableList
+import net.corda.client.jfx.utils.map
 import net.corda.explorer.model.CordaView
 import net.corda.explorer.model.ReportingCurrencyModel
 import net.corda.explorer.model.SettingsModel
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt
index 8b49b5555a..707c627d02 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt
@@ -15,11 +15,11 @@ import javafx.scene.control.TableView
 import javafx.scene.control.TitledPane
 import javafx.scene.layout.BorderPane
 import javafx.scene.layout.VBox
-import net.corda.client.fxutils.filterNotNull
-import net.corda.client.fxutils.lift
-import net.corda.client.fxutils.map
-import net.corda.client.fxutils.sequence
-import net.corda.client.model.*
+import net.corda.client.jfx.model.*
+import net.corda.client.jfx.utils.filterNotNull
+import net.corda.client.jfx.utils.lift
+import net.corda.client.jfx.utils.map
+import net.corda.client.jfx.utils.sequence
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.*
 import net.corda.core.crypto.AbstractParty
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/CashViewer.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/CashViewer.kt
index 4324f64115..bc132c9527 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/CashViewer.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/CashViewer.kt
@@ -17,8 +17,8 @@ import javafx.scene.layout.BorderPane
 import javafx.scene.layout.HBox
 import javafx.scene.layout.Priority
 import javafx.scene.layout.VBox
-import net.corda.client.fxutils.*
-import net.corda.client.model.*
+import net.corda.client.jfx.utils.*
+import net.corda.client.jfx.model.*
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.StateAndRef
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/NewTransaction.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/NewTransaction.kt
index feb6fe2794..6da979b3a7 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/NewTransaction.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/NewTransaction.kt
@@ -12,11 +12,11 @@ import javafx.scene.layout.GridPane
 import javafx.scene.text.Font
 import javafx.scene.text.FontWeight
 import javafx.stage.Window
-import net.corda.client.fxutils.ChosenList
-import net.corda.client.fxutils.isNotNull
-import net.corda.client.fxutils.map
-import net.corda.client.fxutils.unique
-import net.corda.client.model.*
+import net.corda.client.jfx.model.*
+import net.corda.client.jfx.utils.ChosenList
+import net.corda.client.jfx.utils.isNotNull
+import net.corda.client.jfx.utils.map
+import net.corda.client.jfx.utils.unique
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.withoutIssuer
 import net.corda.core.crypto.AbstractParty
diff --git a/tools/loadtest/build.gradle b/tools/loadtest/build.gradle
index 9f72c4e23b..aabdea7168 100644
--- a/tools/loadtest/build.gradle
+++ b/tools/loadtest/build.gradle
@@ -24,7 +24,7 @@ sourceSets {
 mainClassName = 'net.corda.loadtest.MainKt'
 
 dependencies {
-    compile project(':client')
+    compile project(':client:mock')
 
     // https://mvnrepository.com/artifact/com.jcraft/jsch
     compile group: 'com.jcraft', name: 'jsch', version: '0.1.54'
diff --git a/tools/loadtest/src/main/kotlin/net/corda/loadtest/Main.kt b/tools/loadtest/src/main/kotlin/net/corda/loadtest/Main.kt
index 36438275e3..8e3c39c535 100644
--- a/tools/loadtest/src/main/kotlin/net/corda/loadtest/Main.kt
+++ b/tools/loadtest/src/main/kotlin/net/corda/loadtest/Main.kt
@@ -5,7 +5,6 @@ import com.typesafe.config.ConfigParseOptions
 import net.corda.loadtest.tests.crossCashTest
 import net.corda.loadtest.tests.selfIssueTest
 import java.io.File
-import java.nio.file.Paths
 
 /**
  * This is how load testing works: