diff --git a/core/modules/commands/listen.js b/core/modules/commands/listen.js
index 66a68c167..14f1034bc 100644
--- a/core/modules/commands/listen.js
+++ b/core/modules/commands/listen.js
@@ -12,7 +12,7 @@ Listen for HTTP requests and serve tiddlers
 /*global $tw: false */
 "use strict";
 
-var Server = require("$:/core/modules/server.js").Server;
+var Server = require("$:/core/modules/server/server.js").Server;
 
 exports.info = {
 	name: "listen",
diff --git a/core/modules/commands/server.js b/core/modules/commands/server.js
index c6886596a..a7d6cc023 100644
--- a/core/modules/commands/server.js
+++ b/core/modules/commands/server.js
@@ -12,7 +12,7 @@ Deprecated legacy command for serving tiddlers
 /*global $tw: false */
 "use strict";
 
-var Server = require("$:/core/modules/server.js").Server;
+var Server = require("$:/core/modules/server/server.js").Server;
 
 exports.info = {
 	name: "server",
diff --git a/core/modules/serverroute/delete-tiddler.js b/core/modules/server/routes/delete-tiddler.js
similarity index 90%
rename from core/modules/serverroute/delete-tiddler.js
rename to core/modules/server/routes/delete-tiddler.js
index a68e3664a..2640c07fc 100644
--- a/core/modules/serverroute/delete-tiddler.js
+++ b/core/modules/server/routes/delete-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/delete-tiddler.js
+title: $:/core/modules/server/routes/delete-tiddler.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/serverroute/get-favicon.js b/core/modules/server/routes/get-favicon.js
similarity index 89%
rename from core/modules/serverroute/get-favicon.js
rename to core/modules/server/routes/get-favicon.js
index a0690a6bd..57664d1fe 100644
--- a/core/modules/serverroute/get-favicon.js
+++ b/core/modules/server/routes/get-favicon.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/get-favicon.js
+title: $:/core/modules/server/routes/get-favicon.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/serverroute/get-file.js b/core/modules/server/routes/get-file.js
similarity index 95%
rename from core/modules/serverroute/get-file.js
rename to core/modules/server/routes/get-file.js
index 6aa96d386..ba8616979 100644
--- a/core/modules/serverroute/get-file.js
+++ b/core/modules/server/routes/get-file.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/get-file.js
+title: $:/core/modules/server/routes/get-file.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/serverroute/get-index.js b/core/modules/server/routes/get-index.js
similarity index 90%
rename from core/modules/serverroute/get-index.js
rename to core/modules/server/routes/get-index.js
index 0f0f74e2d..16f7fd68c 100644
--- a/core/modules/serverroute/get-index.js
+++ b/core/modules/server/routes/get-index.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/get-index.js
+title: $:/core/modules/server/routes/get-index.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/serverroute/get-status.js b/core/modules/server/routes/get-status.js
similarity index 91%
rename from core/modules/serverroute/get-status.js
rename to core/modules/server/routes/get-status.js
index 039e502f4..10d95e3f5 100644
--- a/core/modules/serverroute/get-status.js
+++ b/core/modules/server/routes/get-status.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/get-status.js
+title: $:/core/modules/server/routes/get-status.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/serverroute/get-tiddler.js b/core/modules/server/routes/get-tiddler.js
similarity index 95%
rename from core/modules/serverroute/get-tiddler.js
rename to core/modules/server/routes/get-tiddler.js
index 60221d9e1..88dad3505 100644
--- a/core/modules/serverroute/get-tiddler.js
+++ b/core/modules/server/routes/get-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/get-tiddler.js
+title: $:/core/modules/server/routes/get-tiddler.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/serverroute/get-tiddlers-json.js b/core/modules/server/routes/get-tiddlers-json.js
similarity index 93%
rename from core/modules/serverroute/get-tiddlers-json.js
rename to core/modules/server/routes/get-tiddlers-json.js
index c823ae3bf..3eb6e1b4c 100644
--- a/core/modules/serverroute/get-tiddlers-json.js
+++ b/core/modules/server/routes/get-tiddlers-json.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/get-tiddlers-json.js
+title: $:/core/modules/server/routes/get-tiddlers-json.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/serverroute/put-tiddler.js b/core/modules/server/routes/put-tiddler.js
similarity index 95%
rename from core/modules/serverroute/put-tiddler.js
rename to core/modules/server/routes/put-tiddler.js
index 72e9c2d56..7f516d7fa 100644
--- a/core/modules/serverroute/put-tiddler.js
+++ b/core/modules/server/routes/put-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/serverroute/put-tiddler.js
+title: $:/core/modules/server/routes/put-tiddler.js
 type: application/javascript
 module-type: serverroute
 
diff --git a/core/modules/server.js b/core/modules/server/server.js
similarity index 99%
rename from core/modules/server.js
rename to core/modules/server/server.js
index 760a039fe..230905b9c 100644
--- a/core/modules/server.js
+++ b/core/modules/server/server.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/server.js
+title: $:/core/modules/server/server.js
 type: application/javascript
 module-type: library