diff --git a/server/api/AdminAPI.js b/server/api/AdminAPI.js
index f5da885..ecb44fb 100644
--- a/server/api/AdminAPI.js
+++ b/server/api/AdminAPI.js
@@ -2,8 +2,8 @@ const express = require('express');
 const router = express.Router();
 const debugMode = Array.from(process.argv.map((arg) => arg.trim().toLowerCase())).includes('debug');
 const logger = require('../modules/Logger')(debugMode);
-const socketManager = (require('../modules/SocketManager.js')).instance;
-const gameManager = (require('../modules/GameManager.js')).instance;
+const socketManager = (require('../modules/singletons/SocketManager.js')).instance;
+const gameManager = (require('../modules/singletons/GameManager.js')).instance;
 const globals = require('../config/globals.js');
 const cors = require('cors');
 
diff --git a/server/api/GamesAPI.js b/server/api/GamesAPI.js
index 9eaaa8d..a5c181a 100644
--- a/server/api/GamesAPI.js
+++ b/server/api/GamesAPI.js
@@ -2,7 +2,7 @@ const express = require('express');
 const router = express.Router();
 const debugMode = Array.from(process.argv.map((arg) => arg.trim().toLowerCase())).includes('debug');
 const logger = require('../modules/Logger')(debugMode);
-const GameManager = require('../modules/GameManager.js');
+const GameManager = require('../modules/singletons/GameManager.js');
 const rateLimit = require('express-rate-limit').default;
 const globals = require('../config/globals.js');
 const cors = require('cors');
diff --git a/server/modules/GameProcess.js b/server/modules/GameProcess.js
index dd44e5e..c779c65 100644
--- a/server/modules/GameProcess.js
+++ b/server/modules/GameProcess.js
@@ -3,6 +3,7 @@ const ServerTimer = require('./ServerTimer.js');
 
 let timer;
 
+// This is a subprocess spawned by logic in the ActiveGameRunner module.
 process.on('message', (msg) => {
     const logger = require('./Logger')(msg.logLevel);
     switch (msg.command) {
diff --git a/server/modules/ServerBootstrapper.js b/server/modules/ServerBootstrapper.js
index 7feec80..1b84068 100644
--- a/server/modules/ServerBootstrapper.js
+++ b/server/modules/ServerBootstrapper.js
@@ -4,9 +4,9 @@ const https = require('https');
 const path = require('path');
 const fs = require('fs');
 const crypto = require('crypto');
-const SocketManager = require('./SocketManager.js');
-const GameManager = require('./GameManager.js');
-const ActiveGameRunner = require('./ActiveGameRunner.js');
+const SocketManager = require('./singletons/SocketManager.js');
+const GameManager = require('./singletons/GameManager.js');
+const ActiveGameRunner = require('./singletons/ActiveGameRunner.js');
 const { ENVIRONMENT } = require('../config/globals.js');
 const rateLimit = require('express-rate-limit').default;
 
diff --git a/server/modules/ActiveGameRunner.js b/server/modules/singletons/ActiveGameRunner.js
similarity index 98%
rename from server/modules/ActiveGameRunner.js
rename to server/modules/singletons/ActiveGameRunner.js
index fc7c2f7..beeb838 100644
--- a/server/modules/ActiveGameRunner.js
+++ b/server/modules/singletons/ActiveGameRunner.js
@@ -1,6 +1,6 @@
 const { fork } = require('child_process');
 const path = require('path');
-const globals = require('../config/globals');
+const globals = require('../../config/globals');
 
 class ActiveGameRunner {
     constructor (logger) {
diff --git a/server/modules/GameManager.js b/server/modules/singletons/GameManager.js
similarity index 98%
rename from server/modules/GameManager.js
rename to server/modules/singletons/GameManager.js
index 5c33f81..05c8282 100644
--- a/server/modules/GameManager.js
+++ b/server/modules/singletons/GameManager.js
@@ -1,9 +1,9 @@
-const globals = require('../config/globals');
-const Game = require('../model/Game');
-const Person = require('../model/Person');
-const GameStateCurator = require('./GameStateCurator');
-const UsernameGenerator = require('./UsernameGenerator');
-const GameCreationRequest = require('../model/GameCreationRequest');
+const globals = require('../../config/globals');
+const Game = require('../../model/Game');
+const Person = require('../../model/Person');
+const GameStateCurator = require('../GameStateCurator');
+const UsernameGenerator = require('../UsernameGenerator');
+const GameCreationRequest = require('../../model/GameCreationRequest');
 
 class GameManager {
     constructor (logger, environment, activeGameRunner) {
diff --git a/server/modules/SocketManager.js b/server/modules/singletons/SocketManager.js
similarity index 99%
rename from server/modules/SocketManager.js
rename to server/modules/singletons/SocketManager.js
index bd2ed04..505f758 100644
--- a/server/modules/SocketManager.js
+++ b/server/modules/singletons/SocketManager.js
@@ -1,4 +1,4 @@
-const globals = require('../config/globals');
+const globals = require('../../config/globals');
 const EVENT_IDS = globals.EVENT_IDS;
 const { RateLimiterMemory } = require('rate-limiter-flexible');
 
diff --git a/spec/unit/server/modules/GameManager_Spec.js b/spec/unit/server/modules/GameManager_Spec.js
index 43f2795..33208ef 100644
--- a/spec/unit/server/modules/GameManager_Spec.js
+++ b/spec/unit/server/modules/GameManager_Spec.js
@@ -4,9 +4,9 @@ const globals = require('../../../../server/config/globals');
 const USER_TYPES = globals.USER_TYPES;
 const STATUS = globals.STATUS;
 const Person = require('../../../../server/model/Person');
-const GameManager = require('../../../../server/modules/GameManager.js');
+const GameManager = require('../../../../server/modules/singletons/GameManager.js');
 const GameStateCurator = require('../../../../server/modules/GameStateCurator.js');
-const ActiveGameRunner = require('../../../../server/modules/ActiveGameRunner.js');
+const ActiveGameRunner = require('../../../../server/modules/singletons/ActiveGameRunner.js');
 const logger = require('../../../../server/modules/Logger.js')(false);
 
 describe('GameManager', () => {