diff --git a/node/AuthorManager.js b/node/db/AuthorManager.js
similarity index 100%
rename from node/AuthorManager.js
rename to node/db/AuthorManager.js
diff --git a/node/db.js b/node/db/DB.js
similarity index 100%
rename from node/db.js
rename to node/db/DB.js
diff --git a/node/Models/Pad.js b/node/db/Pad.js
similarity index 100%
rename from node/Models/Pad.js
rename to node/db/Pad.js
diff --git a/node/PadManager.js b/node/db/PadManager.js
similarity index 100%
rename from node/PadManager.js
rename to node/db/PadManager.js
diff --git a/node/ReadOnlyManager.js b/node/db/ReadOnlyManager.js
similarity index 100%
rename from node/ReadOnlyManager.js
rename to node/db/ReadOnlyManager.js
diff --git a/node/ExportHandler.js b/node/handler/ExportHandler.js
similarity index 100%
rename from node/ExportHandler.js
rename to node/handler/ExportHandler.js
diff --git a/node/ImportHandler.js b/node/handler/ImportHandler.js
similarity index 100%
rename from node/ImportHandler.js
rename to node/handler/ImportHandler.js
diff --git a/node/PadMessageHandler.js b/node/handler/PadMessageHandler.js
similarity index 100%
rename from node/PadMessageHandler.js
rename to node/handler/PadMessageHandler.js
diff --git a/node/SocketIORouter.js b/node/handler/SocketIORouter.js
similarity index 100%
rename from node/SocketIORouter.js
rename to node/handler/SocketIORouter.js
diff --git a/node/TimesliderMessageHandler.js b/node/handler/TimesliderMessageHandler.js
similarity index 100%
rename from node/TimesliderMessageHandler.js
rename to node/handler/TimesliderMessageHandler.js
diff --git a/node/Abiword.js b/node/utils/Abiword.js
similarity index 100%
rename from node/Abiword.js
rename to node/utils/Abiword.js
diff --git a/node/AttributePoolFactory.js b/node/utils/AttributePoolFactory.js
similarity index 100%
rename from node/AttributePoolFactory.js
rename to node/utils/AttributePoolFactory.js
diff --git a/node/Changeset.js b/node/utils/Changeset.js
similarity index 100%
rename from node/Changeset.js
rename to node/utils/Changeset.js
diff --git a/node/exporters/exporthtml.js b/node/utils/ExportHtml.js
similarity index 100%
rename from node/exporters/exporthtml.js
rename to node/utils/ExportHtml.js
diff --git a/node/minify.js b/node/utils/Minify.js
similarity index 100%
rename from node/minify.js
rename to node/utils/Minify.js
diff --git a/node/settings.js b/node/utils/Settings.js
similarity index 100%
rename from node/settings.js
rename to node/utils/Settings.js