diff --git a/build.gradle b/build.gradle
index 762bca6e5d..9553f39c9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,7 +131,7 @@ dependencies {
     compile "com.google.guava:guava:$guava_version"
 
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
 
     // For the buildCordappDependenciesJar task
     runtime project(':client:jfx')
@@ -139,7 +139,7 @@ dependencies {
     runtime project(':client:rpc')
     runtime project(':core')
     runtime project(':finance')
-    runtime project(':node:webserver')
+    runtime project(':client:webserver')
     testCompile project(':test-utils')
 }
 
diff --git a/node/webserver/build.gradle b/client/webserver/build.gradle
similarity index 100%
rename from node/webserver/build.gradle
rename to client/webserver/build.gradle
diff --git a/node/webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt b/client/webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
similarity index 100%
rename from node/webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
rename to client/webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt b/client/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt b/client/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt b/client/webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt b/client/webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/api/Query.kt b/client/webserver/src/main/kotlin/net/corda/webserver/api/Query.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/api/Query.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/api/Query.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt b/client/webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt b/client/webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt b/client/webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt b/client/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt b/client/webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt
diff --git a/node/webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt b/client/webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt
similarity index 100%
rename from node/webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt
rename to client/webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt
diff --git a/node/webserver/webcapsule/build.gradle b/client/webserver/webcapsule/build.gradle
similarity index 98%
rename from node/webserver/webcapsule/build.gradle
rename to client/webserver/webcapsule/build.gradle
index cd5fd14d40..165dc02dde 100644
--- a/node/webserver/webcapsule/build.gradle
+++ b/client/webserver/webcapsule/build.gradle
@@ -33,7 +33,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':node:webserver')
+    compile project(':client:webserver')
 }
 
 task buildWebserverJar(type: FatCapsule) {
diff --git a/docs/source/example-code/build.gradle b/docs/source/example-code/build.gradle
index 9d0f556482..9fd7320e21 100644
--- a/docs/source/example-code/build.gradle
+++ b/docs/source/example-code/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     }
 
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
 }
 
 mainClassName = "net.corda.docs.ClientRpcTutorialKt"
diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle
index 25b3d39e29..f204365037 100644
--- a/samples/attachment-demo/build.gradle
+++ b/samples/attachment-demo/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':test-utils')
 
diff --git a/samples/bank-of-corda-demo/build.gradle b/samples/bank-of-corda-demo/build.gradle
index 5f2eb2766c..0647e9f701 100644
--- a/samples/bank-of-corda-demo/build.gradle
+++ b/samples/bank-of-corda-demo/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client:jfx')
     compile project(':client:rpc')
diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle
index beda652c6f..f98caf1d84 100644
--- a/samples/irs-demo/build.gradle
+++ b/samples/irs-demo/build.gradle
@@ -40,10 +40,10 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
-    compile project(':node:webserver')
+    compile project(':client:webserver')
     compile project(':test-utils')
 
     // Javax is required for webapis
diff --git a/samples/network-visualiser/build.gradle b/samples/network-visualiser/build.gradle
index 6046f94e2a..c1805660fc 100644
--- a/samples/network-visualiser/build.gradle
+++ b/samples/network-visualiser/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
     testCompile project(':test-utils')
diff --git a/samples/raft-notary-demo/build.gradle b/samples/raft-notary-demo/build.gradle
index 7923537a18..78a80b8200 100644
--- a/samples/raft-notary-demo/build.gradle
+++ b/samples/raft-notary-demo/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client:jfx')
     compile project(':client:rpc')
diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle
index 1923267023..7a7bc02eed 100644
--- a/samples/simm-valuation-demo/build.gradle
+++ b/samples/simm-valuation-demo/build.gradle
@@ -41,10 +41,10 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':node')
-    compile project(':node:webserver')
+    compile project(':client:webserver')
     compile project(':finance')
     testCompile project(':test-utils')
 
diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle
index 8aa09c661e..074563b367 100644
--- a/samples/trader-demo/build.gradle
+++ b/samples/trader-demo/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
     compile project(':test-utils')
diff --git a/settings.gradle b/settings.gradle
index 18a2b64934..0d8332d587 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,12 +9,12 @@ include 'node-api'
 include 'node-schemas'
 include 'node'
 include 'node:capsule'
-include 'node:webserver'
-include 'node:webserver:webcapsule'
 include 'client:jackson'
 include 'client:jfx'
 include 'client:mock'
 include 'client:rpc'
+include 'client:webserver'
+include 'client:webserver:webcapsule'
 include 'experimental'
 include 'experimental:sandbox'
 include 'verifier'
diff --git a/test-utils/build.gradle b/test-utils/build.gradle
index 8830b7e969..a7734ded5b 100644
--- a/test-utils/build.gradle
+++ b/test-utils/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     compile project(':finance')
     compile project(':core')
     compile project(':node')
-    compile project(':node:webserver')
+    compile project(':client:webserver')
     compile project(':verifier')
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
diff --git a/tools/demobench/build.gradle b/tools/demobench/build.gradle
index c38a8c6147..a67e25481e 100644
--- a/tools/demobench/build.gradle
+++ b/tools/demobench/build.gradle
@@ -107,7 +107,7 @@ distributions {
                 rename 'corda-(.*)', 'corda.jar'
                 into 'corda'
             }
-            from(project(':node:webserver:webcapsule').tasks.buildWebserverJar) {
+            from(project(':client:webserver:webcapsule').tasks.buildWebserverJar) {
                 rename 'corda-webserver-(.*)', 'corda-webserver.jar'
                 into 'corda'
             }