diff --git a/node/webserver/build.gradle b/node/webserver/build.gradle
new file mode 100644
index 0000000000..e7b0636541
--- /dev/null
+++ b/node/webserver/build.gradle
@@ -0,0 +1,15 @@
+apply plugin: 'kotlin'
+apply plugin: 'java'
+apply plugin: 'net.corda.plugins.publish-utils'
+
+description 'Corda node modules'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    jcenter()
+}
+
+dependencies {
+    compile project(':node')
+}
\ No newline at end of file
diff --git a/node/src/main/kotlin/net/corda/node/webserver/WebServer.kt b/node/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/WebServer.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt
diff --git a/node/src/main/kotlin/net/corda/node/webserver/api/APIServer.kt b/node/webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/api/APIServer.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt
diff --git a/node/src/main/kotlin/net/corda/node/webserver/api/Query.kt b/node/webserver/src/main/kotlin/net/corda/webserver/api/Query.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/api/Query.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/api/Query.kt
diff --git a/node/src/main/kotlin/net/corda/node/webserver/internal/APIServerImpl.kt b/node/webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/internal/APIServerImpl.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt
diff --git a/node/src/main/kotlin/net/corda/node/webserver/servlets/AttachmentDownloadServlet.kt b/node/webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/servlets/AttachmentDownloadServlet.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt
diff --git a/node/src/main/kotlin/net/corda/node/webserver/servlets/DataUploadServlet.kt b/node/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/servlets/DataUploadServlet.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt
diff --git a/node/src/main/kotlin/net/corda/node/webserver/servlets/ObjectMapperConfig.kt b/node/webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/servlets/ObjectMapperConfig.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt
diff --git a/node/src/main/kotlin/net/corda/node/webserver/servlets/ResponseFilter.kt b/node/webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt
similarity index 100%
rename from node/src/main/kotlin/net/corda/node/webserver/servlets/ResponseFilter.kt
rename to node/webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt
diff --git a/settings.gradle b/settings.gradle
index 8fab36dfdb..6384398d10 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,6 +7,7 @@ include 'core'
 include 'node-schemas'
 include 'node'
 include 'node:capsule'
+include 'node:webserver'
 include 'client'
 include 'experimental'
 include 'experimental:sandbox'