diff --git a/core/modules/commands/build.js b/core-server/commands/build.js
similarity index 100%
rename from core/modules/commands/build.js
rename to core-server/commands/build.js
diff --git a/core/modules/commands/clearpassword.js b/core-server/commands/clearpassword.js
similarity index 100%
rename from core/modules/commands/clearpassword.js
rename to core-server/commands/clearpassword.js
diff --git a/core/modules/commands/commands.js b/core-server/commands/commands.js
similarity index 100%
rename from core/modules/commands/commands.js
rename to core-server/commands/commands.js
diff --git a/core/modules/commands/deletetiddlers.js b/core-server/commands/deletetiddlers.js
similarity index 100%
rename from core/modules/commands/deletetiddlers.js
rename to core-server/commands/deletetiddlers.js
diff --git a/core/modules/commands/editions.js b/core-server/commands/editions.js
similarity index 100%
rename from core/modules/commands/editions.js
rename to core-server/commands/editions.js
diff --git a/core/modules/commands/fetch.js b/core-server/commands/fetch.js
similarity index 100%
rename from core/modules/commands/fetch.js
rename to core-server/commands/fetch.js
diff --git a/core/modules/commands/help.js b/core-server/commands/help.js
similarity index 100%
rename from core/modules/commands/help.js
rename to core-server/commands/help.js
diff --git a/core/modules/commands/import.js b/core-server/commands/import.js
similarity index 100%
rename from core/modules/commands/import.js
rename to core-server/commands/import.js
diff --git a/core/modules/commands/init.js b/core-server/commands/init.js
similarity index 100%
rename from core/modules/commands/init.js
rename to core-server/commands/init.js
diff --git a/core/modules/commands/listen.js b/core-server/commands/listen.js
similarity index 100%
rename from core/modules/commands/listen.js
rename to core-server/commands/listen.js
diff --git a/core/modules/commands/load.js b/core-server/commands/load.js
similarity index 100%
rename from core/modules/commands/load.js
rename to core-server/commands/load.js
diff --git a/core/modules/commands/makelibrary.js b/core-server/commands/makelibrary.js
similarity index 100%
rename from core/modules/commands/makelibrary.js
rename to core-server/commands/makelibrary.js
diff --git a/core/modules/commands/output.js b/core-server/commands/output.js
similarity index 100%
rename from core/modules/commands/output.js
rename to core-server/commands/output.js
diff --git a/core/modules/commands/password.js b/core-server/commands/password.js
similarity index 100%
rename from core/modules/commands/password.js
rename to core-server/commands/password.js
diff --git a/core/modules/commands/render.js b/core-server/commands/render.js
similarity index 100%
rename from core/modules/commands/render.js
rename to core-server/commands/render.js
diff --git a/core/modules/commands/rendertiddler.js b/core-server/commands/rendertiddler.js
similarity index 100%
rename from core/modules/commands/rendertiddler.js
rename to core-server/commands/rendertiddler.js
diff --git a/core/modules/commands/rendertiddlers.js b/core-server/commands/rendertiddlers.js
similarity index 100%
rename from core/modules/commands/rendertiddlers.js
rename to core-server/commands/rendertiddlers.js
diff --git a/core/modules/commands/save.js b/core-server/commands/save.js
similarity index 100%
rename from core/modules/commands/save.js
rename to core-server/commands/save.js
diff --git a/core/modules/commands/savelibrarytiddlers.js b/core-server/commands/savelibrarytiddlers.js
similarity index 100%
rename from core/modules/commands/savelibrarytiddlers.js
rename to core-server/commands/savelibrarytiddlers.js
diff --git a/core/modules/commands/savetiddler.js b/core-server/commands/savetiddler.js
similarity index 100%
rename from core/modules/commands/savetiddler.js
rename to core-server/commands/savetiddler.js
diff --git a/core/modules/commands/savetiddlers.js b/core-server/commands/savetiddlers.js
similarity index 100%
rename from core/modules/commands/savetiddlers.js
rename to core-server/commands/savetiddlers.js
diff --git a/core/modules/commands/savewikifolder.js b/core-server/commands/savewikifolder.js
similarity index 100%
rename from core/modules/commands/savewikifolder.js
rename to core-server/commands/savewikifolder.js
diff --git a/core/modules/commands/server.js b/core-server/commands/server.js
similarity index 100%
rename from core/modules/commands/server.js
rename to core-server/commands/server.js
diff --git a/core/modules/commands/setfield.js b/core-server/commands/setfield.js
similarity index 100%
rename from core/modules/commands/setfield.js
rename to core-server/commands/setfield.js
diff --git a/core/modules/commands/unpackplugin.js b/core-server/commands/unpackplugin.js
similarity index 100%
rename from core/modules/commands/unpackplugin.js
rename to core-server/commands/unpackplugin.js
diff --git a/core/modules/commands/verbose.js b/core-server/commands/verbose.js
similarity index 100%
rename from core/modules/commands/verbose.js
rename to core-server/commands/verbose.js
diff --git a/core/modules/commands/version.js b/core-server/commands/version.js
similarity index 100%
rename from core/modules/commands/version.js
rename to core-server/commands/version.js
diff --git a/core/modules/server/authenticators/basic.js b/core-server/server/authenticators/basic.js
similarity index 100%
rename from core/modules/server/authenticators/basic.js
rename to core-server/server/authenticators/basic.js
diff --git a/core/modules/server/authenticators/header.js b/core-server/server/authenticators/header.js
similarity index 100%
rename from core/modules/server/authenticators/header.js
rename to core-server/server/authenticators/header.js
diff --git a/core/modules/server/routes/delete-tiddler.js b/core-server/server/routes/delete-tiddler.js
similarity index 100%
rename from core/modules/server/routes/delete-tiddler.js
rename to core-server/server/routes/delete-tiddler.js
diff --git a/core/modules/server/routes/get-favicon.js b/core-server/server/routes/get-favicon.js
similarity index 100%
rename from core/modules/server/routes/get-favicon.js
rename to core-server/server/routes/get-favicon.js
diff --git a/core/modules/server/routes/get-file.js b/core-server/server/routes/get-file.js
similarity index 100%
rename from core/modules/server/routes/get-file.js
rename to core-server/server/routes/get-file.js
diff --git a/core/modules/server/routes/get-index.js b/core-server/server/routes/get-index.js
similarity index 100%
rename from core/modules/server/routes/get-index.js
rename to core-server/server/routes/get-index.js
diff --git a/core/modules/server/routes/get-login-basic.js b/core-server/server/routes/get-login-basic.js
similarity index 100%
rename from core/modules/server/routes/get-login-basic.js
rename to core-server/server/routes/get-login-basic.js
diff --git a/core/modules/server/routes/get-status.js b/core-server/server/routes/get-status.js
similarity index 100%
rename from core/modules/server/routes/get-status.js
rename to core-server/server/routes/get-status.js
diff --git a/core/modules/server/routes/get-tiddler-html.js b/core-server/server/routes/get-tiddler-html.js
similarity index 100%
rename from core/modules/server/routes/get-tiddler-html.js
rename to core-server/server/routes/get-tiddler-html.js
diff --git a/core/modules/server/routes/get-tiddler.js b/core-server/server/routes/get-tiddler.js
similarity index 100%
rename from core/modules/server/routes/get-tiddler.js
rename to core-server/server/routes/get-tiddler.js
diff --git a/core/modules/server/routes/get-tiddlers-json.js b/core-server/server/routes/get-tiddlers-json.js
similarity index 100%
rename from core/modules/server/routes/get-tiddlers-json.js
rename to core-server/server/routes/get-tiddlers-json.js
diff --git a/core/modules/server/routes/put-tiddler.js b/core-server/server/routes/put-tiddler.js
similarity index 100%
rename from core/modules/server/routes/put-tiddler.js
rename to core-server/server/routes/put-tiddler.js
diff --git a/core/modules/server/server.js b/core-server/server/server.js
similarity index 100%
rename from core/modules/server/server.js
rename to core-server/server/server.js