From 9df625c44d641f5694ddc4ec9c24e47bb9bd1ab9 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Mon, 11 Mar 2024 09:10:01 +0000
Subject: [PATCH] Reorganise JS modules into subdirectories

---
 .../command-mws-load-archive.js               |  2 +-
 .../command-mws-load-tiddlers.js              |  2 +-
 .../command-mws-save-archive.js               |  2 +-
 .../multiwikiserver/modules/init.js           |  4 +--
 .../handlers/delete-recipe-tiddler.js}        |  2 +-
 .../handlers/get-bag-tiddler-blob.js}         |  2 +-
 .../handlers/get-bag-tiddler.js}              |  2 +-
 .../handlers/get-bag.js}                      |  2 +-
 .../handlers/get-recipe-tiddler.js}           |  2 +-
 .../handlers/get-recipe-tiddlers-json.js}     |  2 +-
 .../handlers/get-recipe.js}                   |  2 +-
 .../handlers/get-status.js}                   |  2 +-
 .../handlers/post-bag-tiddlers.js}            |  2 +-
 .../handlers/put-bag.js}                      |  2 +-
 .../handlers/put-recipe-tiddler.js}           |  2 +-
 .../handlers/put-recipe.js}                   |  2 +-
 .../modules/server-extension.js               | 25 -------------------
 .../attachments.js}                           |  2 +-
 .../{ => store}/sql-tiddler-database.js       |  2 +-
 .../modules/{ => store}/sql-tiddler-store.js  |  4 +--
 .../{ => store}/tests-sql-tiddler-database.js |  4 +--
 .../{ => store}/tests-sql-tiddler-store.js    |  4 +--
 22 files changed, 25 insertions(+), 50 deletions(-)
 rename plugins/tiddlywiki/multiwikiserver/modules/{ => commands}/command-mws-load-archive.js (97%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{ => commands}/command-mws-load-tiddlers.js (90%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{ => commands}/command-mws-save-archive.js (95%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-delete-recipe-tiddler.js => routes/handlers/delete-recipe-tiddler.js} (92%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-get-bag-tiddler-blob.js => routes/handlers/get-bag-tiddler-blob.js} (91%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-get-bag-tiddler.js => routes/handlers/get-bag-tiddler.js} (96%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-get-bag.js => routes/handlers/get-bag.js} (96%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-get-recipe-tiddler.js => routes/handlers/get-recipe-tiddler.js} (96%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-get-recipe-tiddlers-json.js => routes/handlers/get-recipe-tiddlers-json.js} (93%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-get-recipe.js => routes/handlers/get-recipe.js} (96%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-get-status.js => routes/handlers/get-status.js} (91%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-post-bag-tiddlers.js => routes/handlers/post-bag-tiddlers.js} (95%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-put-bag.js => routes/handlers/put-bag.js} (93%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-put-recipe-tiddler.js => routes/handlers/put-recipe-tiddler.js} (95%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{route-put-recipe.js => routes/handlers/put-recipe.js} (94%)
 delete mode 100644 plugins/tiddlywiki/multiwikiserver/modules/server-extension.js
 rename plugins/tiddlywiki/multiwikiserver/modules/{attachment-store.js => store/attachments.js} (98%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{ => store}/sql-tiddler-database.js (99%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{ => store}/sql-tiddler-store.js (98%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{ => store}/tests-sql-tiddler-database.js (97%)
 rename plugins/tiddlywiki/multiwikiserver/modules/{ => store}/tests-sql-tiddler-store.js (97%)

diff --git a/plugins/tiddlywiki/multiwikiserver/modules/command-mws-load-archive.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-load-archive.js
similarity index 97%
rename from plugins/tiddlywiki/multiwikiserver/modules/command-mws-load-archive.js
rename to plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-load-archive.js
index bf841f8ab..9e37cb32b 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/command-mws-load-archive.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-load-archive.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/mws-load-archive.js
+title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-load-archive.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/command-mws-load-tiddlers.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-load-tiddlers.js
similarity index 90%
rename from plugins/tiddlywiki/multiwikiserver/modules/command-mws-load-tiddlers.js
rename to plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-load-tiddlers.js
index 51e239995..ff7ad6b70 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/command-mws-load-tiddlers.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-load-tiddlers.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/mws-load-tiddlers.js
+title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-load-tiddlers.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/command-mws-save-archive.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-save-archive.js
similarity index 95%
rename from plugins/tiddlywiki/multiwikiserver/modules/command-mws-save-archive.js
rename to plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-save-archive.js
index 681ca171d..e4f8e14e1 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/command-mws-save-archive.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/command-mws-save-archive.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/mws-save-archive.js
+title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-save-archive.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/init.js b/plugins/tiddlywiki/multiwikiserver/modules/init.js
index a4a36d333..336eabb61 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/init.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/init.js
@@ -21,11 +21,11 @@ exports.synchronous = true;
 exports.startup = function() {
 	var path = require("path");
 	// Create and initialise the tiddler store and upload manager
-	var AttachmentStore = require("$:/plugins/tiddlywiki/multiwikiserver/attachment-store.js").AttachmentStore,
+	var AttachmentStore = require("$:/plugins/tiddlywiki/multiwikiserver/store/attachments.js").AttachmentStore,
 		attachmentStore = new AttachmentStore({
 			storePath: path.resolve($tw.boot.wikiPath,"store/")
 		}),
-		SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/sql-tiddler-store.js").SqlTiddlerStore,
+		SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-store.js").SqlTiddlerStore,
 		store = new SqlTiddlerStore({
 			databasePath: path.resolve($tw.boot.wikiPath,"store/database.sqlite"),
 			engine: $tw.wiki.getTiddlerText("$:/config/MultiWikiServer/Engine","better"), // better || wasm
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-delete-recipe-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-recipe-tiddler.js
similarity index 92%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-delete-recipe-tiddler.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-recipe-tiddler.js
index 1584243eb..e2d786350 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-delete-recipe-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-recipe-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-delete-recipe-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/delete-recipe-tiddler.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler-blob.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js
similarity index 91%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler-blob.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js
index bae09a8ad..b2e5c64b8 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler-blob.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-get-bag-tiddler-blob.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-bag-tiddler-blob.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js
similarity index 96%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js
index 8b883f5f6..9c3906843 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-get-bag-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-bag-tiddler.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js
similarity index 96%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-get-bag.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js
index 0a31fcf5d..e6fe7156d 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-get-bag.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-bag.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
similarity index 96%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe-tiddler.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
index cdc792601..79c350fd7 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-get-recipe-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-recipe-tiddler.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe-tiddlers-json.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js
similarity index 93%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe-tiddlers-json.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js
index 417339b87..00e6a42e7 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe-tiddlers-json.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-get-recipe-tiddlers-json.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-recipe-tiddlers-json.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe.js
similarity index 96%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe.js
index 6dc2ed4e2..05370b832 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-recipe.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-get-recipe.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-recipe.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-status.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-status.js
similarity index 91%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-get-status.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-status.js
index deec1beb7..021bea7b6 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-status.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-status.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-get-status.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-status.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-post-bag-tiddlers.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js
similarity index 95%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-post-bag-tiddlers.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js
index 2c4891f4e..5487718ed 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-post-bag-tiddlers.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-post-bag-tiddlers.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-bag-tiddlers.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-put-bag.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js
similarity index 93%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-put-bag.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js
index bf7fb912e..9dd13f0f7 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-put-bag.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-put-bag.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/put-bag.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
similarity index 95%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe-tiddler.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
index fa4e986f9..3a1fab92a 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-put-recipe-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/put-recipe-tiddler.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js
similarity index 94%
rename from plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe.js
rename to plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js
index 1fbed2c8d..e769b3610 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/route-put-recipe.js
+title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/put-recipe.js
 type: application/javascript
 module-type: route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/server-extension.js b/plugins/tiddlywiki/multiwikiserver/modules/server-extension.js
deleted file mode 100644
index 41be69f00..000000000
--- a/plugins/tiddlywiki/multiwikiserver/modules/server-extension.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*\
-title: $:/plugins/tiddlywiki/multiwikiserver/server-extension.js
-type: application/javascript
-module-type: server-extension
-
-Multi wiki server extension for the core server object
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-function Extension(server) {
-	this.server = server;
-}
-
-Extension.prototype.hook = function(name) {
-	
-};
-
-exports.Extension = Extension;
-
-})();
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/attachment-store.js b/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js
similarity index 98%
rename from plugins/tiddlywiki/multiwikiserver/modules/attachment-store.js
rename to plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js
index 0f719437f..9f411ea8f 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/attachment-store.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/attachment-store.js
+title: $:/plugins/tiddlywiki/multiwikiserver/store/attachments.js
 type: application/javascript
 module-type: library
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-database.js b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
similarity index 99%
rename from plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-database.js
rename to plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
index a102b8ffa..145985550 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-database.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/sql-tiddler-database.js
+title: $:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-database.js
 type: application/javascript
 module-type: library
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-store.js b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
similarity index 98%
rename from plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-store.js
rename to plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
index b0ce7ef08..241a281f6 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-store.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/sql-tiddler-store.js
+title: $:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-store.js
 type: application/javascript
 module-type: library
 
@@ -30,7 +30,7 @@ function SqlTiddlerStore(options) {
 	this.entityStateTiddlerPrefix = "$:/state/MultiWikiServer/";
 	// Create the database
 	this.databasePath = options.databasePath || ":memory:";
-	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/sql-tiddler-database.js").SqlTiddlerDatabase;
+	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-database.js").SqlTiddlerDatabase;
 	this.sqlTiddlerDatabase = new SqlTiddlerDatabase({
 		databasePath: this.databasePath,
 		engine: options.engine
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-database.js b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js
similarity index 97%
rename from plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-database.js
rename to plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js
index ccb0e2fc6..a2ba09efe 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-database.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js
@@ -1,5 +1,5 @@
 /*\
-title: tests-sql-tiddler-database.js
+title: $:/plugins/tiddlywiki/multiwikiserver/store/tests-sql-tiddler-database.js
 type: application/javascript
 tags: [[$:/tags/test-spec]]
 
@@ -24,7 +24,7 @@ describe("SQL tiddler database with better-sqlite3", function() {
 
 function runSqlDatabaseTests(engine) {
 	// Create and initialise the tiddler store
-	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/sql-tiddler-database.js").SqlTiddlerDatabase;
+	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-database.js").SqlTiddlerDatabase;
 	const sqlTiddlerDatabase = new SqlTiddlerDatabase({
 		engine: engine
 	});
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-store.js b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js
similarity index 97%
rename from plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-store.js
rename to plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js
index 46cd7da3e..5c17e4164 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/tests-sql-tiddler-store.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js
@@ -1,5 +1,5 @@
 /*\
-title: tests-sql-tiddler-store.js
+title: $:/plugins/tiddlywiki/multiwikiserver/store/tests-sql-tiddler-store.js
 type: application/javascript
 tags: [[$:/tags/test-spec]]
 
@@ -23,7 +23,7 @@ describe("SQL tiddler store with better-sqlite3", function() {
 });
 
 function runSqlStoreTests(engine) {
-	var SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/sql-tiddler-store.js").SqlTiddlerStore;
+	var SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-store.js").SqlTiddlerStore;
 
 	var store;