diff --git a/radiant/Radiant.cpp b/core/Radiant.cpp
similarity index 98%
rename from radiant/Radiant.cpp
rename to core/Radiant.cpp
index 2bcdfd4a11..e1f68262ff 100644
--- a/radiant/Radiant.cpp
+++ b/core/Radiant.cpp
@@ -9,7 +9,7 @@
 #include "log/LogStream.h"
 #include "log/LogWriter.h"
 #include "log/LogFile.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "messagebus/MessageBus.h"
 
 #ifndef POSIX
diff --git a/radiant/Radiant.h b/core/Radiant.h
similarity index 100%
rename from radiant/Radiant.h
rename to core/Radiant.h
diff --git a/radiant/commandsystem/CaseInsensitiveCompare.h b/core/commandsystem/CaseInsensitiveCompare.h
similarity index 100%
rename from radiant/commandsystem/CaseInsensitiveCompare.h
rename to core/commandsystem/CaseInsensitiveCompare.h
diff --git a/radiant/commandsystem/Command.h b/core/commandsystem/Command.h
similarity index 100%
rename from radiant/commandsystem/Command.h
rename to core/commandsystem/Command.h
diff --git a/radiant/commandsystem/CommandSystem.cpp b/core/commandsystem/CommandSystem.cpp
similarity index 99%
rename from radiant/commandsystem/CommandSystem.cpp
rename to core/commandsystem/CommandSystem.cpp
index 6f5d09ee4f..43da180063 100644
--- a/radiant/commandsystem/CommandSystem.cpp
+++ b/core/commandsystem/CommandSystem.cpp
@@ -12,7 +12,7 @@
 #include <functional>
 #include "string/trim.h"
 #include "string/predicate.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace cmd
 {
diff --git a/radiant/commandsystem/CommandSystem.h b/core/commandsystem/CommandSystem.h
similarity index 100%
rename from radiant/commandsystem/CommandSystem.h
rename to core/commandsystem/CommandSystem.h
diff --git a/radiant/commandsystem/CommandTokeniser.h b/core/commandsystem/CommandTokeniser.h
similarity index 100%
rename from radiant/commandsystem/CommandTokeniser.h
rename to core/commandsystem/CommandTokeniser.h
diff --git a/radiant/commandsystem/Executable.h b/core/commandsystem/Executable.h
similarity index 100%
rename from radiant/commandsystem/Executable.h
rename to core/commandsystem/Executable.h
diff --git a/radiant/commandsystem/Statement.h b/core/commandsystem/Statement.h
similarity index 100%
rename from radiant/commandsystem/Statement.h
rename to core/commandsystem/Statement.h
diff --git a/radiant/log/COutRedirector.cpp b/core/log/COutRedirector.cpp
similarity index 100%
rename from radiant/log/COutRedirector.cpp
rename to core/log/COutRedirector.cpp
diff --git a/radiant/log/COutRedirector.h b/core/log/COutRedirector.h
similarity index 100%
rename from radiant/log/COutRedirector.h
rename to core/log/COutRedirector.h
diff --git a/radiant/log/LogFile.cpp b/core/log/LogFile.cpp
similarity index 100%
rename from radiant/log/LogFile.cpp
rename to core/log/LogFile.cpp
diff --git a/radiant/log/LogFile.h b/core/log/LogFile.h
similarity index 100%
rename from radiant/log/LogFile.h
rename to core/log/LogFile.h
diff --git a/radiant/log/LogStream.cpp b/core/log/LogStream.cpp
similarity index 100%
rename from radiant/log/LogStream.cpp
rename to core/log/LogStream.cpp
diff --git a/radiant/log/LogStream.h b/core/log/LogStream.h
similarity index 100%
rename from radiant/log/LogStream.h
rename to core/log/LogStream.h
diff --git a/radiant/log/LogStreamBuf.cpp b/core/log/LogStreamBuf.cpp
similarity index 100%
rename from radiant/log/LogStreamBuf.cpp
rename to core/log/LogStreamBuf.cpp
diff --git a/radiant/log/LogStreamBuf.h b/core/log/LogStreamBuf.h
similarity index 100%
rename from radiant/log/LogStreamBuf.h
rename to core/log/LogStreamBuf.h
diff --git a/radiant/log/LogWriter.cpp b/core/log/LogWriter.cpp
similarity index 100%
rename from radiant/log/LogWriter.cpp
rename to core/log/LogWriter.cpp
diff --git a/radiant/log/LogWriter.h b/core/log/LogWriter.h
similarity index 100%
rename from radiant/log/LogWriter.h
rename to core/log/LogWriter.h
diff --git a/radiant/log/StringLogDevice.cpp b/core/log/StringLogDevice.cpp
similarity index 100%
rename from radiant/log/StringLogDevice.cpp
rename to core/log/StringLogDevice.cpp
diff --git a/radiant/log/StringLogDevice.h b/core/log/StringLogDevice.h
similarity index 100%
rename from radiant/log/StringLogDevice.h
rename to core/log/StringLogDevice.h
diff --git a/radiant/messagebus/MessageBus.h b/core/messagebus/MessageBus.h
similarity index 100%
rename from radiant/messagebus/MessageBus.h
rename to core/messagebus/MessageBus.h
diff --git a/radiant/modulesystem/ModuleLoader.cpp b/core/modulesystem/ModuleLoader.cpp
similarity index 100%
rename from radiant/modulesystem/ModuleLoader.cpp
rename to core/modulesystem/ModuleLoader.cpp
diff --git a/radiant/modulesystem/ModuleLoader.h b/core/modulesystem/ModuleLoader.h
similarity index 100%
rename from radiant/modulesystem/ModuleLoader.h
rename to core/modulesystem/ModuleLoader.h
diff --git a/radiant/modulesystem/ModuleRegistry.cpp b/core/modulesystem/ModuleRegistry.cpp
similarity index 99%
rename from radiant/modulesystem/ModuleRegistry.cpp
rename to core/modulesystem/ModuleRegistry.cpp
index ad55150a26..7680714dec 100644
--- a/radiant/modulesystem/ModuleRegistry.cpp
+++ b/core/modulesystem/ModuleRegistry.cpp
@@ -5,7 +5,6 @@
 #include "itextstream.h"
 #include <stdexcept>
 #include <iostream>
-#include "ApplicationContextImpl.h"
 #include "ModuleLoader.h"
 
 #include <wx/app.h>
diff --git a/radiant/modulesystem/ModuleRegistry.h b/core/modulesystem/ModuleRegistry.h
similarity index 100%
rename from radiant/modulesystem/ModuleRegistry.h
rename to core/modulesystem/ModuleRegistry.h
diff --git a/radiant/settings/Game.cpp b/core/settings/Game.cpp
similarity index 100%
rename from radiant/settings/Game.cpp
rename to core/settings/Game.cpp
diff --git a/radiant/settings/Game.h b/core/settings/Game.h
similarity index 100%
rename from radiant/settings/Game.h
rename to core/settings/Game.h
diff --git a/radiant/settings/GameManager.cpp b/core/settings/GameManager.cpp
similarity index 99%
rename from radiant/settings/GameManager.cpp
rename to core/settings/GameManager.cpp
index c4b3d86f62..100c42bc0a 100644
--- a/radiant/settings/GameManager.cpp
+++ b/core/settings/GameManager.cpp
@@ -21,7 +21,7 @@
 #include "string/case_conv.h"
 
 #include "wxutil/dialog/MessageBox.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "modulesystem/ApplicationContextImpl.h"
 #include "GameConfigNeededMessage.h"
 
diff --git a/radiant/settings/GameManager.h b/core/settings/GameManager.h
similarity index 100%
rename from radiant/settings/GameManager.h
rename to core/settings/GameManager.h
diff --git a/radiant/settings/LanguageManager.cpp b/core/settings/LanguageManager.cpp
similarity index 100%
rename from radiant/settings/LanguageManager.cpp
rename to core/settings/LanguageManager.cpp
diff --git a/radiant/settings/LanguageManager.h b/core/settings/LanguageManager.h
similarity index 100%
rename from radiant/settings/LanguageManager.h
rename to core/settings/LanguageManager.h
diff --git a/radiant/settings/PreferenceItemBase.h b/core/settings/PreferenceItemBase.h
similarity index 100%
rename from radiant/settings/PreferenceItemBase.h
rename to core/settings/PreferenceItemBase.h
diff --git a/radiant/settings/PreferenceItems.h b/core/settings/PreferenceItems.h
similarity index 100%
rename from radiant/settings/PreferenceItems.h
rename to core/settings/PreferenceItems.h
diff --git a/radiant/settings/PreferencePage.cpp b/core/settings/PreferencePage.cpp
similarity index 100%
rename from radiant/settings/PreferencePage.cpp
rename to core/settings/PreferencePage.cpp
diff --git a/radiant/settings/PreferencePage.h b/core/settings/PreferencePage.h
similarity index 100%
rename from radiant/settings/PreferencePage.h
rename to core/settings/PreferencePage.h
diff --git a/radiant/settings/PreferenceSystem.cpp b/core/settings/PreferenceSystem.cpp
similarity index 96%
rename from radiant/settings/PreferenceSystem.cpp
rename to core/settings/PreferenceSystem.cpp
index 06e3731452..3a5d62ba5e 100644
--- a/radiant/settings/PreferenceSystem.cpp
+++ b/core/settings/PreferenceSystem.cpp
@@ -3,7 +3,7 @@
 #include "ipreferencesystem.h"
 #include "itextstream.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace settings
 {
diff --git a/radiant/settings/PreferenceSystem.h b/core/settings/PreferenceSystem.h
similarity index 100%
rename from radiant/settings/PreferenceSystem.h
rename to core/settings/PreferenceSystem.h
diff --git a/radiant/undo/Operation.h b/core/undo/Operation.h
similarity index 100%
rename from radiant/undo/Operation.h
rename to core/undo/Operation.h
diff --git a/radiant/undo/Stack.h b/core/undo/Stack.h
similarity index 100%
rename from radiant/undo/Stack.h
rename to core/undo/Stack.h
diff --git a/radiant/undo/StackFiller.h b/core/undo/StackFiller.h
similarity index 100%
rename from radiant/undo/StackFiller.h
rename to core/undo/StackFiller.h
diff --git a/radiant/undo/UndoSystem.cpp b/core/undo/UndoSystem.cpp
similarity index 99%
rename from radiant/undo/UndoSystem.cpp
rename to core/undo/UndoSystem.cpp
index 56a6e5a54b..fe8e1ccec1 100644
--- a/radiant/undo/UndoSystem.cpp
+++ b/core/undo/UndoSystem.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 
 #include "registry/registry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "Operation.h"
 #include "StackFiller.h"
 
diff --git a/radiant/undo/UndoSystem.h b/core/undo/UndoSystem.h
similarity index 100%
rename from radiant/undo/UndoSystem.h
rename to core/undo/UndoSystem.h
diff --git a/radiant/vfs/Archive.h b/core/vfs/Archive.h
similarity index 100%
rename from radiant/vfs/Archive.h
rename to core/vfs/Archive.h
diff --git a/radiant/vfs/DeflatedArchiveFile.h b/core/vfs/DeflatedArchiveFile.h
similarity index 100%
rename from radiant/vfs/DeflatedArchiveFile.h
rename to core/vfs/DeflatedArchiveFile.h
diff --git a/radiant/vfs/DeflatedArchiveTextFile.h b/core/vfs/DeflatedArchiveTextFile.h
similarity index 100%
rename from radiant/vfs/DeflatedArchiveTextFile.h
rename to core/vfs/DeflatedArchiveTextFile.h
diff --git a/radiant/vfs/DeflatedInputStream.cpp b/core/vfs/DeflatedInputStream.cpp
similarity index 100%
rename from radiant/vfs/DeflatedInputStream.cpp
rename to core/vfs/DeflatedInputStream.cpp
diff --git a/radiant/vfs/DeflatedInputStream.h b/core/vfs/DeflatedInputStream.h
similarity index 100%
rename from radiant/vfs/DeflatedInputStream.h
rename to core/vfs/DeflatedInputStream.h
diff --git a/radiant/vfs/DirectoryArchive.cpp b/core/vfs/DirectoryArchive.cpp
similarity index 100%
rename from radiant/vfs/DirectoryArchive.cpp
rename to core/vfs/DirectoryArchive.cpp
diff --git a/radiant/vfs/DirectoryArchive.h b/core/vfs/DirectoryArchive.h
similarity index 100%
rename from radiant/vfs/DirectoryArchive.h
rename to core/vfs/DirectoryArchive.h
diff --git a/radiant/vfs/DirectoryArchiveTextFile.h b/core/vfs/DirectoryArchiveTextFile.h
similarity index 100%
rename from radiant/vfs/DirectoryArchiveTextFile.h
rename to core/vfs/DirectoryArchiveTextFile.h
diff --git a/radiant/vfs/Doom3FileSystem.cpp b/core/vfs/Doom3FileSystem.cpp
similarity index 99%
rename from radiant/vfs/Doom3FileSystem.cpp
rename to core/vfs/Doom3FileSystem.cpp
index 78da17e003..066baec73c 100644
--- a/radiant/vfs/Doom3FileSystem.cpp
+++ b/core/vfs/Doom3FileSystem.cpp
@@ -39,7 +39,7 @@
 #include "DirectoryArchiveTextFile.h"
 #include "SortedFilenames.h"
 #include "ZipArchive.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace vfs
 {
diff --git a/radiant/vfs/Doom3FileSystem.h b/core/vfs/Doom3FileSystem.h
similarity index 100%
rename from radiant/vfs/Doom3FileSystem.h
rename to core/vfs/Doom3FileSystem.h
diff --git a/radiant/vfs/Doom3FileSystemModule.cpp b/core/vfs/Doom3FileSystemModule.cpp
similarity index 78%
rename from radiant/vfs/Doom3FileSystemModule.cpp
rename to core/vfs/Doom3FileSystemModule.cpp
index 0a04cc49b0..7f93925fe5 100644
--- a/radiant/vfs/Doom3FileSystemModule.cpp
+++ b/core/vfs/Doom3FileSystemModule.cpp
@@ -1,5 +1,5 @@
 #include "vfs/Doom3FileSystem.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace vfs
 {
diff --git a/radiant/vfs/GenericFileSystem.h b/core/vfs/GenericFileSystem.h
similarity index 100%
rename from radiant/vfs/GenericFileSystem.h
rename to core/vfs/GenericFileSystem.h
diff --git a/radiant/vfs/SortedFilenames.h b/core/vfs/SortedFilenames.h
similarity index 100%
rename from radiant/vfs/SortedFilenames.h
rename to core/vfs/SortedFilenames.h
diff --git a/radiant/vfs/StoredArchiveFile.h b/core/vfs/StoredArchiveFile.h
similarity index 100%
rename from radiant/vfs/StoredArchiveFile.h
rename to core/vfs/StoredArchiveFile.h
diff --git a/radiant/vfs/StoredArchiveTextFile.h b/core/vfs/StoredArchiveTextFile.h
similarity index 100%
rename from radiant/vfs/StoredArchiveTextFile.h
rename to core/vfs/StoredArchiveTextFile.h
diff --git a/radiant/vfs/UnixPath.h b/core/vfs/UnixPath.h
similarity index 100%
rename from radiant/vfs/UnixPath.h
rename to core/vfs/UnixPath.h
diff --git a/radiant/vfs/ZipArchive.cpp b/core/vfs/ZipArchive.cpp
similarity index 100%
rename from radiant/vfs/ZipArchive.cpp
rename to core/vfs/ZipArchive.cpp
diff --git a/radiant/vfs/ZipArchive.h b/core/vfs/ZipArchive.h
similarity index 100%
rename from radiant/vfs/ZipArchive.h
rename to core/vfs/ZipArchive.h
diff --git a/radiant/vfs/ZipStreamUtils.h b/core/vfs/ZipStreamUtils.h
similarity index 100%
rename from radiant/vfs/ZipStreamUtils.h
rename to core/vfs/ZipStreamUtils.h
diff --git a/radiant/xmlregistry/Autosaver.h b/core/xmlregistry/Autosaver.h
similarity index 100%
rename from radiant/xmlregistry/Autosaver.h
rename to core/xmlregistry/Autosaver.h
diff --git a/radiant/xmlregistry/RegistryTree.cpp b/core/xmlregistry/RegistryTree.cpp
similarity index 100%
rename from radiant/xmlregistry/RegistryTree.cpp
rename to core/xmlregistry/RegistryTree.cpp
diff --git a/radiant/xmlregistry/RegistryTree.h b/core/xmlregistry/RegistryTree.h
similarity index 100%
rename from radiant/xmlregistry/RegistryTree.h
rename to core/xmlregistry/RegistryTree.h
diff --git a/radiant/xmlregistry/XMLRegistry.cpp b/core/xmlregistry/XMLRegistry.cpp
similarity index 99%
rename from radiant/xmlregistry/XMLRegistry.cpp
rename to core/xmlregistry/XMLRegistry.cpp
index ff7ba48494..607fce53cd 100644
--- a/radiant/xmlregistry/XMLRegistry.cpp
+++ b/core/xmlregistry/XMLRegistry.cpp
@@ -10,7 +10,7 @@
 #include "version.h"
 #include "string/string.h"
 #include "wxutil/IConv.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace registry
 {
diff --git a/radiant/xmlregistry/XMLRegistry.h b/core/xmlregistry/XMLRegistry.h
similarity index 100%
rename from radiant/xmlregistry/XMLRegistry.h
rename to core/xmlregistry/XMLRegistry.h
diff --git a/include/version.h b/include/version.h
index 10862c5550..dd7cf8e0a0 100644
--- a/include/version.h
+++ b/include/version.h
@@ -2,7 +2,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "2.8.0pre5"
+#define RADIANT_VERSION "2.9.0core"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"
diff --git a/radiant/modulesystem/StaticModule.cpp b/libs/module/StaticModule.cpp
similarity index 100%
rename from radiant/modulesystem/StaticModule.cpp
rename to libs/module/StaticModule.cpp
diff --git a/radiant/modulesystem/StaticModule.h b/libs/module/StaticModule.h
similarity index 98%
rename from radiant/modulesystem/StaticModule.h
rename to libs/module/StaticModule.h
index 468fd3a8e1..9007815c1e 100644
--- a/radiant/modulesystem/StaticModule.h
+++ b/libs/module/StaticModule.h
@@ -2,7 +2,6 @@
 
 #include <functional>
 #include "imodule.h"
-#include "ModuleRegistry.h"
 
 /**
  * greebo: Use a StaticModule to define a static RegisterableModule,
diff --git a/radiant/RadiantApp.cpp b/radiant/RadiantApp.cpp
index 87aeca1129..9b512b6991 100644
--- a/radiant/RadiantApp.cpp
+++ b/radiant/RadiantApp.cpp
@@ -8,7 +8,7 @@
 #include "module/CoreModule.h"
 #include "GameConfigNeededMessage.h"
 #include "ui/prefdialog/GameSetupDialog.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <wx/wxprec.h>
 #include <wx/event.h>
diff --git a/radiant/RadiantModule.cpp b/radiant/RadiantModule.cpp
index 6471496abe..293fe907ea 100644
--- a/radiant/RadiantModule.cpp
+++ b/radiant/RadiantModule.cpp
@@ -16,7 +16,7 @@
 #include "ui/mainframe/ScreenUpdateBlocker.h"
 #include "ui/mru/MRU.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "selection/algorithm/General.h"
 #include "brush/csg/CSG.h"
 
diff --git a/radiant/brush/BrushModule.cpp b/radiant/brush/BrushModule.cpp
index c855ac5a66..0b2476a8b4 100644
--- a/radiant/brush/BrushModule.cpp
+++ b/radiant/brush/BrushModule.cpp
@@ -15,7 +15,7 @@
 
 #include "registry/registry.h"
 #include "ipreferencesystem.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "selection/algorithm/Primitives.h"
 
diff --git a/radiant/camera/GlobalCamera.cpp b/radiant/camera/GlobalCamera.cpp
index c17378b6a5..cb67699b3a 100644
--- a/radiant/camera/GlobalCamera.cpp
+++ b/radiant/camera/GlobalCamera.cpp
@@ -11,7 +11,7 @@
 #include "CameraSettings.h"
 
 #include "registry/registry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "wxutil/MouseButton.h"
 
 #include "tools/ShaderClipboardTools.h"
diff --git a/radiant/clipper/Clipper.cpp b/radiant/clipper/Clipper.cpp
index 0a0eca9eeb..c4246af946 100644
--- a/radiant/clipper/Clipper.cpp
+++ b/radiant/clipper/Clipper.cpp
@@ -11,7 +11,7 @@
 #include "itexdef.h"
 
 #include "registry/registry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "ClipPoint.h"
 #include "brush/csg/CSG.h"
 #include "ui/texturebrowser/TextureBrowser.h"
diff --git a/radiant/eclassmgr/EClassManager.cpp b/radiant/eclassmgr/EClassManager.cpp
index 1f3f934932..cd658a1626 100644
--- a/radiant/eclassmgr/EClassManager.cpp
+++ b/radiant/eclassmgr/EClassManager.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 
 #include "debugging/ScopedDebugTimer.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace eclass {
 
diff --git a/radiant/entity/EntityCreator.cpp b/radiant/entity/EntityCreator.cpp
index 1a9c5388dc..b66f835f1f 100644
--- a/radiant/entity/EntityCreator.cpp
+++ b/radiant/entity/EntityCreator.cpp
@@ -25,7 +25,7 @@
 #include "generic/GenericEntityNode.h"
 #include "eclassmodel/EclassModelNode.h"
 #include "target/TargetManager.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace entity
 {
diff --git a/radiant/eventmanager/EventManager.cpp b/radiant/eventmanager/EventManager.cpp
index da12f7538d..03926532af 100644
--- a/radiant/eventmanager/EventManager.cpp
+++ b/radiant/eventmanager/EventManager.cpp
@@ -24,7 +24,7 @@
 #include "MouseToolManager.h"
 
 #include "debugging/debugging.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include <iostream>
 
 namespace ui
diff --git a/radiant/filetypes/FileTypeRegistry.cpp b/radiant/filetypes/FileTypeRegistry.cpp
index 82899e4fa1..6d533a009e 100644
--- a/radiant/filetypes/FileTypeRegistry.cpp
+++ b/radiant/filetypes/FileTypeRegistry.cpp
@@ -6,7 +6,7 @@
 #include "debugging/debugging.h"
 
 #include "string/case_conv.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 FileTypeRegistry::FileTypeRegistry()
 {
diff --git a/radiant/filters/BasicFilterSystem.cpp b/radiant/filters/BasicFilterSystem.cpp
index 74200152cd..f3a03a7e12 100644
--- a/radiant/filters/BasicFilterSystem.cpp
+++ b/radiant/filters/BasicFilterSystem.cpp
@@ -9,7 +9,7 @@
 #include "igame.h"
 #include "ishaders.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "InstanceUpdateWalker.h"
 #include "SetObjectSelectionByFilterWalker.h"
 
diff --git a/radiant/fonts/FontManager.cpp b/radiant/fonts/FontManager.cpp
index 15b1192398..ce8990a203 100644
--- a/radiant/fonts/FontManager.cpp
+++ b/radiant/fonts/FontManager.cpp
@@ -6,7 +6,7 @@
 #include "iregistry.h"
 #include "igame.h"
 #include "os/path.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "xmlutil/MissingXMLNodeException.h"
 
diff --git a/radiant/image/Doom3ImageLoader.cpp b/radiant/image/Doom3ImageLoader.cpp
index 5ed30da23f..052f61afc3 100644
--- a/radiant/image/Doom3ImageLoader.cpp
+++ b/radiant/image/Doom3ImageLoader.cpp
@@ -12,7 +12,7 @@
 
 #include "os/path.h"
 #include "DirectoryArchiveFile.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace image
 {
diff --git a/radiant/layers/LayerManager.cpp b/radiant/layers/LayerManager.cpp
index 5f77a4303b..dc21e21958 100644
--- a/radiant/layers/LayerManager.cpp
+++ b/radiant/layers/LayerManager.cpp
@@ -10,7 +10,7 @@
 #include "icommandsystem.h"
 #include "scene/Node.h"
 #include "scenelib.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "AddToLayerWalker.h"
 #include "MoveToLayerWalker.h"
diff --git a/radiant/layers/LayerModule.cpp b/radiant/layers/LayerModule.cpp
index bc7f554cc6..78fb32dda9 100644
--- a/radiant/layers/LayerModule.cpp
+++ b/radiant/layers/LayerModule.cpp
@@ -6,7 +6,7 @@
 #include "imapinfofile.h"
 #include "imap.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "LayerManager.h"
 #include "LayerInfoFileModule.h"
 
diff --git a/radiant/log/PIDFile.h b/radiant/log/PIDFile.h
index cc4e82c79e..f5acb19837 100644
--- a/radiant/log/PIDFile.h
+++ b/radiant/log/PIDFile.h
@@ -2,7 +2,6 @@
 
 #include "imodule.h"
 #include "wxutil/dialog/MessageBox.h"
-#include "settings/PreferenceSystem.h"
 
 #include "os/file.h"
 #include "string/replace.h"
diff --git a/radiant/map/AasFileManager.cpp b/radiant/map/AasFileManager.cpp
index 4d3ea6ff78..ed27fe7aed 100644
--- a/radiant/map/AasFileManager.cpp
+++ b/radiant/map/AasFileManager.cpp
@@ -7,7 +7,7 @@
 #include "ifilesystem.h"
 #include "eclass.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "ui/aas/AasControlDialog.h"
 
 namespace map
diff --git a/radiant/map/AutoSaver.cpp b/radiant/map/AutoSaver.cpp
index 669a040278..dd9883a9df 100644
--- a/radiant/map/AutoSaver.cpp
+++ b/radiant/map/AutoSaver.cpp
@@ -24,7 +24,7 @@
 #include "string/convert.h"
 #include "map/Map.h"
 #include "modulesystem/ApplicationContextImpl.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "wxutil/dialog/MessageBox.h"
 
 #include <fmt/format.h>
diff --git a/radiant/map/CounterManager.cpp b/radiant/map/CounterManager.cpp
index c6f893289e..114121a474 100644
--- a/radiant/map/CounterManager.cpp
+++ b/radiant/map/CounterManager.cpp
@@ -4,7 +4,7 @@
 #include "iuimanager.h"
 #include "selectionlib.h"
 #include "string/string.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <fmt/format.h>
 
diff --git a/radiant/map/EditingStopwatch.cpp b/radiant/map/EditingStopwatch.cpp
index da217dcd3c..2982783d32 100644
--- a/radiant/map/EditingStopwatch.cpp
+++ b/radiant/map/EditingStopwatch.cpp
@@ -13,7 +13,7 @@
 
 #include <fmt/format.h>
 #include "string/convert.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "EditingStopwatchInfoFileModule.h"
 
 namespace map
diff --git a/radiant/map/Map.cpp b/radiant/map/Map.cpp
index 496abf5051..cf60103f44 100644
--- a/radiant/map/Map.cpp
+++ b/radiant/map/Map.cpp
@@ -52,8 +52,7 @@
 #include "selection/algorithm/Primitives.h"
 #include "selection/algorithm/Group.h"
 #include "selection/algorithm/Transformation.h"
-#include "modulesystem/ModuleRegistry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "RenderableAasFile.h"
 #include "MapPropertyInfoFileModule.h"
 
diff --git a/radiant/map/MapFormatManager.cpp b/radiant/map/MapFormatManager.cpp
index 169b042fe5..23740780eb 100644
--- a/radiant/map/MapFormatManager.cpp
+++ b/radiant/map/MapFormatManager.cpp
@@ -2,7 +2,7 @@
 
 #include "itextstream.h"
 #include "igame.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "debugging/debugging.h"
 #include "string/case_conv.h"
diff --git a/radiant/map/MapModules.cpp b/radiant/map/MapModules.cpp
index 30f8ef721f..a90dbf09e2 100644
--- a/radiant/map/MapModules.cpp
+++ b/radiant/map/MapModules.cpp
@@ -6,7 +6,7 @@
 #include "aas/Doom3AasFileLoader.h"
 
 #include "imapformat.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "Map.h"
 
 // Static module instances
diff --git a/radiant/map/MapResourceManager.cpp b/radiant/map/MapResourceManager.cpp
index b9f12863d3..12833457e6 100644
--- a/radiant/map/MapResourceManager.cpp
+++ b/radiant/map/MapResourceManager.cpp
@@ -4,7 +4,7 @@
 #include "ifiletypes.h"
 #include "itextstream.h"
 #include "os/path.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "MapResource.h"
 
 namespace map
diff --git a/radiant/map/PointFile.cpp b/radiant/map/PointFile.cpp
index c018164d22..a1367ff940 100644
--- a/radiant/map/PointFile.cpp
+++ b/radiant/map/PointFile.cpp
@@ -18,7 +18,7 @@
 #include "xyview/GlobalXYWnd.h"
 #include <fmt/format.h>
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #ifdef MessageBox
 #undef MessageBox
diff --git a/radiant/map/RegionManager.cpp b/radiant/map/RegionManager.cpp
index 605a53c0bd..f692e12e8b 100644
--- a/radiant/map/RegionManager.cpp
+++ b/radiant/map/RegionManager.cpp
@@ -30,7 +30,7 @@
 #include "selection/algorithm/General.h"
 #include "map/MapResource.h"
 #include "map/Map.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <memory>
 
diff --git a/radiant/map/infofile/InfoFileManager.cpp b/radiant/map/infofile/InfoFileManager.cpp
index 877aa95c4c..08b3fbcd77 100644
--- a/radiant/map/infofile/InfoFileManager.cpp
+++ b/radiant/map/infofile/InfoFileManager.cpp
@@ -1,7 +1,7 @@
 #include "InfoFileManager.h"
 
 #include "itextstream.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace map
 {
diff --git a/radiant/md5model/plugin.cpp b/radiant/md5model/plugin.cpp
index bc9240a696..7794d158c1 100644
--- a/radiant/md5model/plugin.cpp
+++ b/radiant/md5model/plugin.cpp
@@ -3,7 +3,7 @@
 #include "MD5ModelLoader.h"
 #include "MD5AnimationCache.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace md5
 {
diff --git a/radiant/model/ModelCache.cpp b/radiant/model/ModelCache.cpp
index 4ae558bd4f..f2fe4d5cca 100644
--- a/radiant/model/ModelCache.cpp
+++ b/radiant/model/ModelCache.cpp
@@ -12,7 +12,7 @@
 #include "os/path.h"
 #include "os/file.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "NullModelLoader.h"
 #include <functional>
 
diff --git a/radiant/model/ModelFormatManager.cpp b/radiant/model/ModelFormatManager.cpp
index 1f219ca41d..0bde8071d0 100644
--- a/radiant/model/ModelFormatManager.cpp
+++ b/radiant/model/ModelFormatManager.cpp
@@ -7,7 +7,7 @@
 #include "ipreferencesystem.h"
 #include "string/case_conv.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace model
 {
diff --git a/radiant/modelfile/PicoModelModule.cpp b/radiant/modelfile/PicoModelModule.cpp
index 0642c24dda..17795527ff 100644
--- a/radiant/modelfile/PicoModelModule.cpp
+++ b/radiant/modelfile/PicoModelModule.cpp
@@ -1,6 +1,6 @@
 #include "PicoModelModule.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace model
 {
diff --git a/radiant/namespace/Namespace.cpp b/radiant/namespace/Namespace.cpp
index 57bb78474e..0c6e3682a4 100644
--- a/radiant/namespace/Namespace.cpp
+++ b/radiant/namespace/Namespace.cpp
@@ -2,7 +2,7 @@
 
 #include "inameobserver.h"
 #include "itextstream.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <list>
 
diff --git a/radiant/namespace/NamespaceFactory.cpp b/radiant/namespace/NamespaceFactory.cpp
index 2d008d40ea..c4189425b6 100644
--- a/radiant/namespace/NamespaceFactory.cpp
+++ b/radiant/namespace/NamespaceFactory.cpp
@@ -2,7 +2,7 @@
 #include "itextstream.h"
 
 #include "Namespace.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 INamespacePtr NamespaceFactory::createNamespace() {
 	return NamespacePtr(new Namespace);
diff --git a/radiant/particles/particles.cpp b/radiant/particles/particles.cpp
index 52d12377d4..3e75c77e3f 100644
--- a/radiant/particles/particles.cpp
+++ b/radiant/particles/particles.cpp
@@ -1,7 +1,7 @@
 #include "ParticlesManager.h"
 
 #include "editor/ParticleEditorModule.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 // Static module instances
 module::StaticModule<particles::ParticlesManager> particlesManagerModule;
diff --git a/radiant/patch/PatchModule.cpp b/radiant/patch/PatchModule.cpp
index ac961671c0..e170230ff0 100644
--- a/radiant/patch/PatchModule.cpp
+++ b/radiant/patch/PatchModule.cpp
@@ -1,5 +1,5 @@
 #include "PatchCreators.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 // Define the static patchcreator modules
 module::StaticModule<Doom3PatchCreator> doom3PatchDef3Creator;
diff --git a/radiant/render/OpenGLModule.cpp b/radiant/render/OpenGLModule.cpp
index 58294f59e9..e775195da0 100644
--- a/radiant/render/OpenGLModule.cpp
+++ b/radiant/render/OpenGLModule.cpp
@@ -4,7 +4,7 @@
 #include "itextstream.h"
 #include "imainframe.h"
 #include "debugging/debugging.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <string/convert.h>
 #include "wxutil/GLWidget.h"
diff --git a/radiant/render/OpenGLRenderSystem.cpp b/radiant/render/OpenGLRenderSystem.cpp
index 6b2615d13a..c2060524db 100644
--- a/radiant/render/OpenGLRenderSystem.cpp
+++ b/radiant/render/OpenGLRenderSystem.cpp
@@ -4,7 +4,7 @@
 #include "igl.h"
 #include "itextstream.h"
 #include "math/Matrix4.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "backend/GLProgramFactory.h"
 #include "debugging/debugging.h"
 
diff --git a/radiant/render/RenderSystemFactory.cpp b/radiant/render/RenderSystemFactory.cpp
index 4471101b0e..eeace2b8d0 100644
--- a/radiant/render/RenderSystemFactory.cpp
+++ b/radiant/render/RenderSystemFactory.cpp
@@ -1,7 +1,7 @@
 #include "RenderSystemFactory.h"
 
 #include "itextstream.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "OpenGLRenderSystem.h"
 
diff --git a/radiant/render/debug/SpacePartitionRenderer.cpp b/radiant/render/debug/SpacePartitionRenderer.cpp
index 502e49ba6f..f85395d0b5 100644
--- a/radiant/render/debug/SpacePartitionRenderer.cpp
+++ b/radiant/render/debug/SpacePartitionRenderer.cpp
@@ -1,7 +1,7 @@
 #include "SpacePartitionRenderer.h"
 
 #include "registry/adaptors.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include <functional>
 
 namespace render
diff --git a/radiant/scenegraph/SceneGraph.cpp b/radiant/scenegraph/SceneGraph.cpp
index 147908b3ee..d0f0275a63 100644
--- a/radiant/scenegraph/SceneGraph.cpp
+++ b/radiant/scenegraph/SceneGraph.cpp
@@ -10,7 +10,7 @@
 #include "Octree.h"
 #include "SceneGraphFactory.h"
 #include "util/ScopedBoolLock.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace scene
 {
diff --git a/radiant/selection/RadiantSelectionSystem.cpp b/radiant/selection/RadiantSelectionSystem.cpp
index b1d669311c..c7138b154c 100644
--- a/radiant/selection/RadiantSelectionSystem.cpp
+++ b/radiant/selection/RadiantSelectionSystem.cpp
@@ -10,7 +10,7 @@
 #include "imousetoolmanager.h"
 #include "SelectionPool.h"
 #include "SelectionTest.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "SelectionMouseTools.h"
 #include "ManipulateMouseTool.h"
 #include "selection/algorithm/General.h"
diff --git a/radiant/selection/algorithm/Primitives.cpp b/radiant/selection/algorithm/Primitives.cpp
index a5e6e7895a..d0a4b1452c 100644
--- a/radiant/selection/algorithm/Primitives.cpp
+++ b/radiant/selection/algorithm/Primitives.cpp
@@ -7,6 +7,7 @@
 #include "ientity.h"
 #include "itextstream.h"
 #include "iundo.h"
+#include "igame.h"
 #include "imainframe.h"
 #include "brush/BrushModule.h"
 #include "brush/BrushVisit.h"
@@ -21,7 +22,6 @@
 #include "ui/modelselector/ModelSelector.h"
 #include "ui/texturebrowser/TextureBrowser.h"
 #include "ui/brush/QuerySidesDialog.h"
-#include "settings/GameManager.h"
 #include "selection/shaderclipboard/ShaderClipboard.h"
 #include "scenelib.h"
 #include "selectionlib.h"
diff --git a/radiant/selection/group/SelectionGroupManager.cpp b/radiant/selection/group/SelectionGroupManager.cpp
index 8685a26751..424ade3b05 100644
--- a/radiant/selection/group/SelectionGroupManager.cpp
+++ b/radiant/selection/group/SelectionGroupManager.cpp
@@ -10,7 +10,7 @@
 #include "ieventmanager.h"
 #include "imainframe.h"
 #include "iorthocontextmenu.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "selection/algorithm/Group.h"
 
 #include "wxutil/dialog/MessageBox.h"
diff --git a/radiant/selection/group/SelectionGroupModule.cpp b/radiant/selection/group/SelectionGroupModule.cpp
index ceeec5079d..021cd786ab 100644
--- a/radiant/selection/group/SelectionGroupModule.cpp
+++ b/radiant/selection/group/SelectionGroupModule.cpp
@@ -14,7 +14,7 @@
 #include "SelectionGroupInfoFileModule.h"
 #include "wxutil/menu/MenuItem.h"
 #include "wxutil/menu/IconTextMenuItem.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace selection
 {
diff --git a/radiant/selection/selectionset/SelectionSetModule.cpp b/radiant/selection/selectionset/SelectionSetModule.cpp
index 5eaf4a2f27..6ff8c74811 100644
--- a/radiant/selection/selectionset/SelectionSetModule.cpp
+++ b/radiant/selection/selectionset/SelectionSetModule.cpp
@@ -9,7 +9,7 @@
 #include "iradiant.h"
 
 #include <sigc++/sigc++.h>
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "SelectionSetInfoFileModule.h"
 #include "SelectionSetToolmenu.h"
diff --git a/radiant/shaders/Doom3ShaderSystem.cpp b/radiant/shaders/Doom3ShaderSystem.cpp
index a356713fdd..25b3359774 100644
--- a/radiant/shaders/Doom3ShaderSystem.cpp
+++ b/radiant/shaders/Doom3ShaderSystem.cpp
@@ -19,7 +19,7 @@
 #include "ShaderExpression.h"
 
 #include "debugging/ScopedDebugTimer.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "string/predicate.h"
 #include "string/replace.h"
diff --git a/radiant/skins/Doom3SkinCache.cpp b/radiant/skins/Doom3SkinCache.cpp
index 9bfee012f7..cd411344ed 100644
--- a/radiant/skins/Doom3SkinCache.cpp
+++ b/radiant/skins/Doom3SkinCache.cpp
@@ -3,7 +3,7 @@
 #include "itextstream.h"
 #include "ifilesystem.h"
 #include "iarchive.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <iostream>
 
diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
index 6c71e237e3..a687db6e5d 100644
--- a/radiant/ui/UserInterfaceModule.cpp
+++ b/radiant/ui/UserInterfaceModule.cpp
@@ -9,7 +9,7 @@
 #include "wxutil/menu/CommandMenuItem.h"
 #include "wxutil/MultiMonitor.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "ui/prefdialog/GameSetupDialog.h"
 #include "ui/layers/LayerOrthoContextMenuItem.h"
diff --git a/radiant/ui/about/AboutDialog.cpp b/radiant/ui/about/AboutDialog.cpp
index fffe632c15..756139a5a1 100644
--- a/radiant/ui/about/AboutDialog.cpp
+++ b/radiant/ui/about/AboutDialog.cpp
@@ -13,7 +13,6 @@
 #include <wx/button.h>
 #include <wx/textctrl.h>
 
-#include "modulesystem/ModuleRegistry.h"
 #include <fmt/format.h>
 
 namespace ui {
diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
index abd22d3d21..c4626cc095 100644
--- a/radiant/ui/einspector/EntityInspector.cpp
+++ b/radiant/ui/einspector/EntityInspector.cpp
@@ -14,7 +14,7 @@
 #include "imainframe.h"
 #include "itextstream.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "selectionlib.h"
 #include "scenelib.h"
 #include "wxutil/dialog/MessageBox.h"
diff --git a/radiant/ui/einspector/PropertyEditorFactory.cpp b/radiant/ui/einspector/PropertyEditorFactory.cpp
index 16ea177357..8cf9f81885 100644
--- a/radiant/ui/einspector/PropertyEditorFactory.cpp
+++ b/radiant/ui/einspector/PropertyEditorFactory.cpp
@@ -15,7 +15,6 @@
 #include "ClassnamePropertyEditor.h"
 #include "AnglePropertyEditor.h"
 
-#include "modulesystem/ModuleRegistry.h"
 #include <regex>
 
 #include <wx/artprov.h>
diff --git a/radiant/ui/grid/GridManager.cpp b/radiant/ui/grid/GridManager.cpp
index a671e150c3..7afa720cb7 100644
--- a/radiant/ui/grid/GridManager.cpp
+++ b/radiant/ui/grid/GridManager.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 #include <fmt/format.h>
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace ui
 {
diff --git a/radiant/ui/mainframe/MainFrame.cpp b/radiant/ui/mainframe/MainFrame.cpp
index 691ab34ee0..1037f86677 100644
--- a/radiant/ui/mainframe/MainFrame.cpp
+++ b/radiant/ui/mainframe/MainFrame.cpp
@@ -22,7 +22,7 @@
 #include "ui/mainframe/TopLevelFrame.h"
 #include "map/Map.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include <functional>
 #include <fmt/format.h>
 
diff --git a/radiant/ui/mainframe/MainFrameLayoutManager.cpp b/radiant/ui/mainframe/MainFrameLayoutManager.cpp
index 03ef6bebc4..98c9c823c2 100644
--- a/radiant/ui/mainframe/MainFrameLayoutManager.cpp
+++ b/radiant/ui/mainframe/MainFrameLayoutManager.cpp
@@ -6,7 +6,7 @@
 #include "imainframe.h"
 #include "icommandsystem.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "FloatingLayout.h"
 #include "SplitPaneLayout.h"
diff --git a/radiant/ui/mediabrowser/MediaBrowser.cpp b/radiant/ui/mediabrowser/MediaBrowser.cpp
index 079658096b..f8a2a70cf2 100644
--- a/radiant/ui/mediabrowser/MediaBrowser.cpp
+++ b/radiant/ui/mediabrowser/MediaBrowser.cpp
@@ -34,7 +34,7 @@
 #include "ui/common/TexturePreviewCombo.h"
 
 #include "debugging/ScopedDebugTimer.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <functional>
 #include "string/predicate.h"
diff --git a/radiant/ui/ortho/OrthoContextMenu.cpp b/radiant/ui/ortho/OrthoContextMenu.cpp
index 3c0a8f01a0..8b5b43363e 100644
--- a/radiant/ui/ortho/OrthoContextMenu.cpp
+++ b/radiant/ui/ortho/OrthoContextMenu.cpp
@@ -13,7 +13,6 @@
 #include "iuimanager.h"
 #include "imainframe.h"
 #include "map/Map.h"
-#include "modulesystem/ModuleRegistry.h"
 
 #include "wxutil/dialog/MessageBox.h"
 #include "wxutil/menu/IconTextMenuItem.h"
@@ -31,7 +30,7 @@
 #include <wx/window.h>
 #include <wx/menu.h>
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace ui
 {
diff --git a/radiant/ui/prefdialog/GameSetupDialog.cpp b/radiant/ui/prefdialog/GameSetupDialog.cpp
index 7b058bec2b..6ea4e5d695 100644
--- a/radiant/ui/prefdialog/GameSetupDialog.cpp
+++ b/radiant/ui/prefdialog/GameSetupDialog.cpp
@@ -3,7 +3,6 @@
 #include "imainframe.h"
 #include "i18n.h"
 #include "igame.h"
-#include "modulesystem/ModuleRegistry.h"
 
 #include "wxutil/dialog/MessageBox.h"
 #include "registry/registry.h"
@@ -13,7 +12,6 @@
 #include <wx/choicebk.h>
 #include <wx/stattext.h>
 #include <wx/button.h>
-#include "settings/GameManager.h"
 
 namespace ui
 {
diff --git a/radiant/ui/prefdialog/PrefDialog.cpp b/radiant/ui/prefdialog/PrefDialog.cpp
index 9c76a4d0ea..e06b8e5505 100644
--- a/radiant/ui/prefdialog/PrefDialog.cpp
+++ b/radiant/ui/prefdialog/PrefDialog.cpp
@@ -2,6 +2,7 @@
 
 #include "imainframe.h"
 #include "itextstream.h"
+#include "ipreferencesystem.h"
 
 #include "i18n.h"
 
@@ -14,9 +15,6 @@
 #include "string/join.h"
 #include "string/predicate.h"
 
-#include "settings/PreferenceSystem.h"
-#include "settings/PreferencePage.h"
-
 namespace ui
 {
 
diff --git a/radiant/ui/prefdialog/PrefPage.cpp b/radiant/ui/prefdialog/PrefPage.cpp
index bf8aaef8b0..c9bea3e948 100644
--- a/radiant/ui/prefdialog/PrefPage.cpp
+++ b/radiant/ui/prefdialog/PrefPage.cpp
@@ -1,11 +1,11 @@
 #include "PrefPage.h"
 
 #include "i18n.h"
+#include "ipreferencesystem.h"
 
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 
-#include "settings/PreferenceItems.h"
 #include "PreferenceItem.h"
 
 namespace ui 
diff --git a/radiant/ui/prefdialog/PrefPage.h b/radiant/ui/prefdialog/PrefPage.h
index 6beec960cc..7ca6e2d1dc 100644
--- a/radiant/ui/prefdialog/PrefPage.h
+++ b/radiant/ui/prefdialog/PrefPage.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "ipreferencesystem.h"
 #include <wx/scrolwin.h>
 
 #include "registry/buffer.h"
-#include "settings/PreferencePage.h"
 
 class wxFlexGridSizer;
 
diff --git a/radiant/ui/splash/Splash.cpp b/radiant/ui/splash/Splash.cpp
index a5a7d15291..7f4dbdad3f 100644
--- a/radiant/ui/splash/Splash.cpp
+++ b/radiant/ui/splash/Splash.cpp
@@ -1,5 +1,6 @@
 #include "Splash.h"
 
+#include "imodule.h"
 #include <wx/panel.h>
 #include <wx/dcbuffer.h>
 #include <wx/splash.h>
@@ -8,8 +9,6 @@
 #include <sigc++/retype_return.h>
 #include <sigc++/functors/mem_fun.h>
 
-#include "modulesystem/ModuleRegistry.h"
-
 namespace ui
 {
 
diff --git a/radiant/ui/texturebrowser/TextureBrowserManager.cpp b/radiant/ui/texturebrowser/TextureBrowserManager.cpp
index 316c6f284e..a86bb1495f 100644
--- a/radiant/ui/texturebrowser/TextureBrowserManager.cpp
+++ b/radiant/ui/texturebrowser/TextureBrowserManager.cpp
@@ -9,7 +9,7 @@
 #include "ipreferencesystem.h"
 #include "iuimanager.h"
 #include "itextstream.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace ui
 {
diff --git a/radiant/uimanager/UIManager.cpp b/radiant/uimanager/UIManager.cpp
index 24ce56f1e8..c42834d1a1 100644
--- a/radiant/uimanager/UIManager.cpp
+++ b/radiant/uimanager/UIManager.cpp
@@ -1,5 +1,5 @@
 #include "UIManager.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "i18n.h"
 #include "itextstream.h"
diff --git a/radiant/xyview/GlobalXYWnd.cpp b/radiant/xyview/GlobalXYWnd.cpp
index 8bba0fef5c..11a22fe3e8 100644
--- a/radiant/xyview/GlobalXYWnd.cpp
+++ b/radiant/xyview/GlobalXYWnd.cpp
@@ -9,7 +9,7 @@
 
 #include "registry/registry.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "selection/algorithm/General.h"
 #include "camera/GlobalCamera.h"
 #include "wxutil/MouseButton.h"
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index daf40d4fbd..61c750becb 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -731,7 +731,6 @@
     <ClCompile Include="..\..\radiant\model\NullModel.cpp" />
     <ClCompile Include="..\..\radiant\model\NullModelNode.cpp" />
     <ClCompile Include="..\..\radiant\model\ScaledModelExporter.cpp" />
-    <ClCompile Include="..\..\radiant\modulesystem\StaticModule.cpp" />
     <ClCompile Include="..\..\radiant\namespace\ComplexName.cpp" />
     <ClCompile Include="..\..\radiant\particles\editor\ParticleEditor.cpp" />
     <ClCompile Include="..\..\radiant\particles\ParticleDef.cpp" />
@@ -1326,7 +1325,6 @@
     <ClInclude Include="..\..\radiant\map\algorithm\Traverse.h" />
     <ClInclude Include="..\..\radiant\map\algorithm\WorldspawnArgFinder.h" />
     <ClInclude Include="..\..\radiant\modulesystem\ApplicationContextImpl.h" />
-    <ClInclude Include="..\..\radiant\modulesystem\StaticModule.h" />
     <ClInclude Include="..\..\radiant\namespace\ComplexName.h" />
     <ClInclude Include="..\..\radiant\namespace\Namespace.h" />
     <ClInclude Include="..\..\radiant\namespace\NamespaceFactory.h" />
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index 88daa07e92..067ada2020 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -1525,9 +1525,6 @@
     <ClCompile Include="..\..\radiant\model\ModelScalePreserver.cpp">
       <Filter>src\model</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\modulesystem\StaticModule.cpp">
-      <Filter>src\modulesystem</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\settings\Win32Registry.cpp">
       <Filter>src\settings</Filter>
     </ClCompile>
@@ -1698,9 +1695,6 @@
     <ClInclude Include="..\..\radiant\modulesystem\ApplicationContextImpl.h">
       <Filter>src\modulesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\modulesystem\StaticModule.h">
-      <Filter>src\modulesystem</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\namespace\ComplexName.h">
       <Filter>src\namespace</Filter>
     </ClInclude>
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index a666e352e5..abe8319e37 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -19,81 +19,79 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\radiant\commandsystem\CommandSystem.cpp" />
-    <ClCompile Include="..\..\radiant\log\COutRedirector.cpp" />
-    <ClCompile Include="..\..\radiant\log\LogFile.cpp" />
-    <ClCompile Include="..\..\radiant\log\LogStream.cpp" />
-    <ClCompile Include="..\..\radiant\log\LogStreamBuf.cpp" />
-    <ClCompile Include="..\..\radiant\log\LogWriter.cpp" />
-    <ClCompile Include="..\..\radiant\log\StringLogDevice.cpp" />
-    <ClCompile Include="..\..\radiant\modulesystem\ModuleLoader.cpp" />
-    <ClCompile Include="..\..\radiant\modulesystem\ModuleRegistry.cpp" />
-    <ClCompile Include="..\..\radiant\modulesystem\StaticModule.cpp" />
-    <ClCompile Include="..\..\radiant\Radiant.cpp" />
-    <ClCompile Include="..\..\radiant\settings\Game.cpp" />
-    <ClCompile Include="..\..\radiant\settings\GameManager.cpp" />
-    <ClCompile Include="..\..\radiant\settings\LanguageManager.cpp" />
-    <ClCompile Include="..\..\radiant\settings\PreferencePage.cpp" />
-    <ClCompile Include="..\..\radiant\settings\PreferenceSystem.cpp" />
-    <ClCompile Include="..\..\radiant\undo\UndoSystem.cpp" />
-    <ClCompile Include="..\..\radiant\vfs\DeflatedInputStream.cpp" />
-    <ClCompile Include="..\..\radiant\vfs\DirectoryArchive.cpp" />
-    <ClCompile Include="..\..\radiant\vfs\Doom3FileSystem.cpp" />
-    <ClCompile Include="..\..\radiant\vfs\Doom3FileSystemModule.cpp" />
-    <ClCompile Include="..\..\radiant\vfs\ZipArchive.cpp" />
-    <ClCompile Include="..\..\radiant\xmlregistry\RegistryTree.cpp" />
-    <ClCompile Include="..\..\radiant\xmlregistry\XMLRegistry.cpp" />
+    <ClCompile Include="..\..\core\Radiant.cpp" />
+    <ClCompile Include="..\..\core\commandsystem\CommandSystem.cpp" />
+    <ClCompile Include="..\..\core\log\COutRedirector.cpp" />
+    <ClCompile Include="..\..\core\log\LogFile.cpp" />
+    <ClCompile Include="..\..\core\log\LogStream.cpp" />
+    <ClCompile Include="..\..\core\log\LogStreamBuf.cpp" />
+    <ClCompile Include="..\..\core\log\LogWriter.cpp" />
+    <ClCompile Include="..\..\core\log\StringLogDevice.cpp" />
+    <ClCompile Include="..\..\core\modulesystem\ModuleLoader.cpp" />
+    <ClCompile Include="..\..\core\modulesystem\ModuleRegistry.cpp" />
+    <ClCompile Include="..\..\core\settings\Game.cpp" />
+    <ClCompile Include="..\..\core\settings\GameManager.cpp" />
+    <ClCompile Include="..\..\core\settings\LanguageManager.cpp" />
+    <ClCompile Include="..\..\core\settings\PreferencePage.cpp" />
+    <ClCompile Include="..\..\core\settings\PreferenceSystem.cpp" />
+    <ClCompile Include="..\..\core\undo\UndoSystem.cpp" />
+    <ClCompile Include="..\..\core\vfs\DeflatedInputStream.cpp" />
+    <ClCompile Include="..\..\core\vfs\DirectoryArchive.cpp" />
+    <ClCompile Include="..\..\core\vfs\Doom3FileSystem.cpp" />
+    <ClCompile Include="..\..\core\vfs\Doom3FileSystemModule.cpp" />
+    <ClCompile Include="..\..\core\vfs\ZipArchive.cpp" />
+    <ClCompile Include="..\..\core\xmlregistry\RegistryTree.cpp" />
+    <ClCompile Include="..\..\core\xmlregistry\XMLRegistry.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\radiant\commandsystem\CaseInsensitiveCompare.h" />
-    <ClInclude Include="..\..\radiant\commandsystem\Command.h" />
-    <ClInclude Include="..\..\radiant\commandsystem\CommandSystem.h" />
-    <ClInclude Include="..\..\radiant\commandsystem\CommandTokeniser.h" />
-    <ClInclude Include="..\..\radiant\commandsystem\Executable.h" />
-    <ClInclude Include="..\..\radiant\commandsystem\Statement.h" />
-    <ClInclude Include="..\..\radiant\log\COutRedirector.h" />
-    <ClInclude Include="..\..\radiant\log\LogDevice.h" />
-    <ClInclude Include="..\..\radiant\log\LogFile.h" />
-    <ClInclude Include="..\..\radiant\log\LogLevels.h" />
-    <ClInclude Include="..\..\radiant\log\LogStream.h" />
-    <ClInclude Include="..\..\radiant\log\LogStreamBuf.h" />
-    <ClInclude Include="..\..\radiant\log\LogWriter.h" />
-    <ClInclude Include="..\..\radiant\log\PIDFile.h" />
-    <ClInclude Include="..\..\radiant\log\PopupErrorHandler.h" />
-    <ClInclude Include="..\..\radiant\log\StringLogDevice.h" />
-    <ClInclude Include="..\..\radiant\messagebus\MessageBus.h" />
-    <ClInclude Include="..\..\radiant\modulesystem\ModuleLoader.h" />
-    <ClInclude Include="..\..\radiant\modulesystem\ModuleRegistry.h" />
-    <ClInclude Include="..\..\radiant\modulesystem\StaticModule.h" />
-    <ClInclude Include="..\..\radiant\Radiant.h" />
-    <ClInclude Include="..\..\radiant\settings\Game.h" />
-    <ClInclude Include="..\..\radiant\settings\GameManager.h" />
-    <ClInclude Include="..\..\radiant\settings\LanguageManager.h" />
-    <ClInclude Include="..\..\radiant\settings\PreferenceItemBase.h" />
-    <ClInclude Include="..\..\radiant\settings\PreferenceItems.h" />
-    <ClInclude Include="..\..\radiant\settings\PreferencePage.h" />
-    <ClInclude Include="..\..\radiant\settings\PreferenceSystem.h" />
-    <ClInclude Include="..\..\radiant\undo\Operation.h" />
-    <ClInclude Include="..\..\radiant\undo\Stack.h" />
-    <ClInclude Include="..\..\radiant\undo\StackFiller.h" />
-    <ClInclude Include="..\..\radiant\undo\UndoSystem.h" />
-    <ClInclude Include="..\..\radiant\vfs\Archive.h" />
-    <ClInclude Include="..\..\radiant\vfs\DeflatedArchiveFile.h" />
-    <ClInclude Include="..\..\radiant\vfs\DeflatedArchiveTextFile.h" />
-    <ClInclude Include="..\..\radiant\vfs\DeflatedInputStream.h" />
-    <ClInclude Include="..\..\radiant\vfs\DirectoryArchive.h" />
-    <ClInclude Include="..\..\radiant\vfs\DirectoryArchiveTextFile.h" />
-    <ClInclude Include="..\..\radiant\vfs\Doom3FileSystem.h" />
-    <ClInclude Include="..\..\radiant\vfs\GenericFileSystem.h" />
-    <ClInclude Include="..\..\radiant\vfs\SortedFilenames.h" />
-    <ClInclude Include="..\..\radiant\vfs\StoredArchiveFile.h" />
-    <ClInclude Include="..\..\radiant\vfs\StoredArchiveTextFile.h" />
-    <ClInclude Include="..\..\radiant\vfs\UnixPath.h" />
-    <ClInclude Include="..\..\radiant\vfs\ZipArchive.h" />
-    <ClInclude Include="..\..\radiant\vfs\ZipStreamUtils.h" />
-    <ClInclude Include="..\..\radiant\xmlregistry\Autosaver.h" />
-    <ClInclude Include="..\..\radiant\xmlregistry\RegistryTree.h" />
-    <ClInclude Include="..\..\radiant\xmlregistry\XMLRegistry.h" />
+    <ClInclude Include="..\..\core\Radiant.h" />
+    <ClInclude Include="..\..\core\commandsystem\CaseInsensitiveCompare.h" />
+    <ClInclude Include="..\..\core\commandsystem\Command.h" />
+    <ClInclude Include="..\..\core\commandsystem\CommandSystem.h" />
+    <ClInclude Include="..\..\core\commandsystem\CommandTokeniser.h" />
+    <ClInclude Include="..\..\core\commandsystem\Executable.h" />
+    <ClInclude Include="..\..\core\commandsystem\Statement.h" />
+    <ClInclude Include="..\..\core\log\COutRedirector.h" />
+    <ClInclude Include="..\..\core\log\LogDevice.h" />
+    <ClInclude Include="..\..\core\log\LogFile.h" />
+    <ClInclude Include="..\..\core\log\LogLevels.h" />
+    <ClInclude Include="..\..\core\log\LogStream.h" />
+    <ClInclude Include="..\..\core\log\LogStreamBuf.h" />
+    <ClInclude Include="..\..\core\log\LogWriter.h" />
+    <ClInclude Include="..\..\core\log\PIDFile.h" />
+    <ClInclude Include="..\..\core\log\PopupErrorHandler.h" />
+    <ClInclude Include="..\..\core\log\StringLogDevice.h" />
+    <ClInclude Include="..\..\core\messagebus\MessageBus.h" />
+    <ClInclude Include="..\..\core\modulesystem\ModuleLoader.h" />
+    <ClInclude Include="..\..\core\modulesystem\ModuleRegistry.h" />
+    <ClInclude Include="..\..\core\settings\Game.h" />
+    <ClInclude Include="..\..\core\settings\GameManager.h" />
+    <ClInclude Include="..\..\core\settings\LanguageManager.h" />
+    <ClInclude Include="..\..\core\settings\PreferenceItemBase.h" />
+    <ClInclude Include="..\..\core\settings\PreferenceItems.h" />
+    <ClInclude Include="..\..\core\settings\PreferencePage.h" />
+    <ClInclude Include="..\..\core\settings\PreferenceSystem.h" />
+    <ClInclude Include="..\..\core\undo\Operation.h" />
+    <ClInclude Include="..\..\core\undo\Stack.h" />
+    <ClInclude Include="..\..\core\undo\StackFiller.h" />
+    <ClInclude Include="..\..\core\undo\UndoSystem.h" />
+    <ClInclude Include="..\..\core\vfs\Archive.h" />
+    <ClInclude Include="..\..\core\vfs\DeflatedArchiveFile.h" />
+    <ClInclude Include="..\..\core\vfs\DeflatedArchiveTextFile.h" />
+    <ClInclude Include="..\..\core\vfs\DeflatedInputStream.h" />
+    <ClInclude Include="..\..\core\vfs\DirectoryArchive.h" />
+    <ClInclude Include="..\..\core\vfs\DirectoryArchiveTextFile.h" />
+    <ClInclude Include="..\..\core\vfs\Doom3FileSystem.h" />
+    <ClInclude Include="..\..\core\vfs\GenericFileSystem.h" />
+    <ClInclude Include="..\..\core\vfs\SortedFilenames.h" />
+    <ClInclude Include="..\..\core\vfs\StoredArchiveFile.h" />
+    <ClInclude Include="..\..\core\vfs\StoredArchiveTextFile.h" />
+    <ClInclude Include="..\..\core\vfs\UnixPath.h" />
+    <ClInclude Include="..\..\core\vfs\ZipArchive.h" />
+    <ClInclude Include="..\..\core\vfs\ZipStreamUtils.h" />
+    <ClInclude Include="..\..\core\xmlregistry\Autosaver.h" />
+    <ClInclude Include="..\..\core\xmlregistry\RegistryTree.h" />
+    <ClInclude Include="..\..\core\xmlregistry\XMLRegistry.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index be8b1a02d9..d8018e6e47 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -31,226 +31,220 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\radiant\modulesystem\ModuleLoader.cpp">
+    <ClCompile Include="..\..\core\modulesystem\ModuleLoader.cpp">
       <Filter>src\modulesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\modulesystem\ModuleRegistry.cpp">
+    <ClCompile Include="..\..\core\modulesystem\ModuleRegistry.cpp">
       <Filter>src\modulesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\modulesystem\StaticModule.cpp">
-      <Filter>src\modulesystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\log\COutRedirector.cpp">
+    <ClCompile Include="..\..\core\log\COutRedirector.cpp">
       <Filter>src\log</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\log\LogStream.cpp">
+    <ClCompile Include="..\..\core\log\LogStream.cpp">
       <Filter>src\log</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\log\LogStreamBuf.cpp">
+    <ClCompile Include="..\..\core\log\LogStreamBuf.cpp">
       <Filter>src\log</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\log\LogWriter.cpp">
+    <ClCompile Include="..\..\core\log\LogWriter.cpp">
       <Filter>src\log</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\log\StringLogDevice.cpp">
+    <ClCompile Include="..\..\core\log\StringLogDevice.cpp">
       <Filter>src\log</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\Radiant.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\log\LogFile.cpp">
+    <ClCompile Include="..\..\core\log\LogFile.cpp">
       <Filter>src\log</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\settings\LanguageManager.cpp">
+    <ClCompile Include="..\..\core\settings\LanguageManager.cpp">
       <Filter>src\settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\xmlregistry\RegistryTree.cpp">
+    <ClCompile Include="..\..\core\xmlregistry\RegistryTree.cpp">
       <Filter>src\xmlregistry</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\xmlregistry\XMLRegistry.cpp">
+    <ClCompile Include="..\..\core\xmlregistry\XMLRegistry.cpp">
       <Filter>src\xmlregistry</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\vfs\DeflatedInputStream.cpp">
+    <ClCompile Include="..\..\core\vfs\DeflatedInputStream.cpp">
       <Filter>src\vfs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\vfs\DirectoryArchive.cpp">
+    <ClCompile Include="..\..\core\vfs\DirectoryArchive.cpp">
       <Filter>src\vfs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\vfs\Doom3FileSystem.cpp">
+    <ClCompile Include="..\..\core\vfs\Doom3FileSystem.cpp">
       <Filter>src\vfs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\vfs\Doom3FileSystemModule.cpp">
+    <ClCompile Include="..\..\core\vfs\Doom3FileSystemModule.cpp">
       <Filter>src\vfs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\vfs\ZipArchive.cpp">
+    <ClCompile Include="..\..\core\vfs\ZipArchive.cpp">
       <Filter>src\vfs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\undo\UndoSystem.cpp">
+    <ClCompile Include="..\..\core\undo\UndoSystem.cpp">
       <Filter>src\undo</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\commandsystem\CommandSystem.cpp">
+    <ClCompile Include="..\..\core\commandsystem\CommandSystem.cpp">
       <Filter>src\commandsystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\settings\PreferencePage.cpp">
+    <ClCompile Include="..\..\core\settings\PreferencePage.cpp">
       <Filter>src\settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\settings\PreferenceSystem.cpp">
+    <ClCompile Include="..\..\core\settings\PreferenceSystem.cpp">
       <Filter>src\settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\settings\Game.cpp">
+    <ClCompile Include="..\..\core\settings\Game.cpp">
       <Filter>src\settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\settings\GameManager.cpp">
+    <ClCompile Include="..\..\core\settings\GameManager.cpp">
       <Filter>src\settings</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Radiant.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\radiant\modulesystem\ModuleLoader.h">
+    <ClInclude Include="..\..\core\modulesystem\ModuleLoader.h">
       <Filter>src\modulesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\modulesystem\ModuleRegistry.h">
+    <ClInclude Include="..\..\core\modulesystem\ModuleRegistry.h">
       <Filter>src\modulesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\modulesystem\StaticModule.h">
-      <Filter>src\modulesystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\log\COutRedirector.h">
+    <ClInclude Include="..\..\core\log\COutRedirector.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\LogDevice.h">
+    <ClInclude Include="..\..\core\log\LogDevice.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\LogLevels.h">
+    <ClInclude Include="..\..\core\log\LogLevels.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\LogStream.h">
+    <ClInclude Include="..\..\core\log\LogStream.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\LogStreamBuf.h">
+    <ClInclude Include="..\..\core\log\LogStreamBuf.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\LogWriter.h">
+    <ClInclude Include="..\..\core\log\LogWriter.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\PIDFile.h">
+    <ClInclude Include="..\..\core\log\PIDFile.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\PopupErrorHandler.h">
+    <ClInclude Include="..\..\core\log\PopupErrorHandler.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\StringLogDevice.h">
+    <ClInclude Include="..\..\core\log\StringLogDevice.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\LogFile.h">
+    <ClInclude Include="..\..\core\log\LogFile.h">
       <Filter>src\log</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\Radiant.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\settings\LanguageManager.h">
+    <ClInclude Include="..\..\core\settings\LanguageManager.h">
       <Filter>src\settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\xmlregistry\Autosaver.h">
+    <ClInclude Include="..\..\core\xmlregistry\Autosaver.h">
       <Filter>src\xmlregistry</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\xmlregistry\RegistryTree.h">
+    <ClInclude Include="..\..\core\xmlregistry\RegistryTree.h">
       <Filter>src\xmlregistry</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\xmlregistry\XMLRegistry.h">
+    <ClInclude Include="..\..\core\xmlregistry\XMLRegistry.h">
       <Filter>src\xmlregistry</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\Archive.h">
+    <ClInclude Include="..\..\core\vfs\Archive.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\DeflatedArchiveFile.h">
+    <ClInclude Include="..\..\core\vfs\DeflatedArchiveFile.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\DeflatedArchiveTextFile.h">
+    <ClInclude Include="..\..\core\vfs\DeflatedArchiveTextFile.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\DeflatedInputStream.h">
+    <ClInclude Include="..\..\core\vfs\DeflatedInputStream.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\DirectoryArchive.h">
+    <ClInclude Include="..\..\core\vfs\DirectoryArchive.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\DirectoryArchiveTextFile.h">
+    <ClInclude Include="..\..\core\vfs\DirectoryArchiveTextFile.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\Doom3FileSystem.h">
+    <ClInclude Include="..\..\core\vfs\Doom3FileSystem.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\GenericFileSystem.h">
+    <ClInclude Include="..\..\core\vfs\GenericFileSystem.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\SortedFilenames.h">
+    <ClInclude Include="..\..\core\vfs\SortedFilenames.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\StoredArchiveFile.h">
+    <ClInclude Include="..\..\core\vfs\StoredArchiveFile.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\StoredArchiveTextFile.h">
+    <ClInclude Include="..\..\core\vfs\StoredArchiveTextFile.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\UnixPath.h">
+    <ClInclude Include="..\..\core\vfs\UnixPath.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\ZipArchive.h">
+    <ClInclude Include="..\..\core\vfs\ZipArchive.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\vfs\ZipStreamUtils.h">
+    <ClInclude Include="..\..\core\vfs\ZipStreamUtils.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\undo\Operation.h">
+    <ClInclude Include="..\..\core\undo\Operation.h">
       <Filter>src\undo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\undo\Stack.h">
+    <ClInclude Include="..\..\core\undo\Stack.h">
       <Filter>src\undo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\undo\StackFiller.h">
+    <ClInclude Include="..\..\core\undo\StackFiller.h">
       <Filter>src\undo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\undo\UndoSystem.h">
+    <ClInclude Include="..\..\core\undo\UndoSystem.h">
       <Filter>src\undo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\commandsystem\CaseInsensitiveCompare.h">
+    <ClInclude Include="..\..\core\commandsystem\CaseInsensitiveCompare.h">
       <Filter>src\commandsystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\commandsystem\Command.h">
+    <ClInclude Include="..\..\core\commandsystem\Command.h">
       <Filter>src\commandsystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\commandsystem\CommandSystem.h">
+    <ClInclude Include="..\..\core\commandsystem\CommandSystem.h">
       <Filter>src\commandsystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\commandsystem\CommandTokeniser.h">
+    <ClInclude Include="..\..\core\commandsystem\CommandTokeniser.h">
       <Filter>src\commandsystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\commandsystem\Executable.h">
+    <ClInclude Include="..\..\core\commandsystem\Executable.h">
       <Filter>src\commandsystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\commandsystem\Statement.h">
+    <ClInclude Include="..\..\core\commandsystem\Statement.h">
       <Filter>src\commandsystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\settings\PreferenceItemBase.h">
+    <ClInclude Include="..\..\core\settings\PreferenceItemBase.h">
       <Filter>src\settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\settings\PreferenceItems.h">
+    <ClInclude Include="..\..\core\settings\PreferenceItems.h">
       <Filter>src\settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\settings\PreferencePage.h">
+    <ClInclude Include="..\..\core\settings\PreferencePage.h">
       <Filter>src\settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\settings\PreferenceSystem.h">
+    <ClInclude Include="..\..\core\settings\PreferenceSystem.h">
       <Filter>src\settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\settings\Game.h">
+    <ClInclude Include="..\..\core\settings\Game.h">
       <Filter>src\settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\settings\GameManager.h">
+    <ClInclude Include="..\..\core\settings\GameManager.h">
       <Filter>src\settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\messagebus\MessageBus.h">
+    <ClInclude Include="..\..\core\messagebus\MessageBus.h">
       <Filter>src\messagebus</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\core\Radiant.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tools/msvc/modulelib.vcxproj b/tools/msvc/modulelib.vcxproj
index 3eb28219fc..551082a222 100644
--- a/tools/msvc/modulelib.vcxproj
+++ b/tools/msvc/modulelib.vcxproj
@@ -148,10 +148,12 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\module\CoreModule.cpp" />
     <ClCompile Include="..\..\libs\module\DynamicLibrary.cpp" />
+    <ClCompile Include="..\..\libs\module\StaticModule.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libs\module\CoreModule.h" />
     <ClInclude Include="..\..\libs\module\DynamicLibrary.h" />
+    <ClInclude Include="..\..\libs\module\StaticModule.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/tools/msvc/modulelib.vcxproj.filters b/tools/msvc/modulelib.vcxproj.filters
index 4f2ac626dc..bcaa0505c7 100644
--- a/tools/msvc/modulelib.vcxproj.filters
+++ b/tools/msvc/modulelib.vcxproj.filters
@@ -3,9 +3,11 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\module\DynamicLibrary.cpp" />
     <ClCompile Include="..\..\libs\module\CoreModule.cpp" />
+    <ClCompile Include="..\..\libs\module\StaticModule.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libs\module\DynamicLibrary.h" />
     <ClInclude Include="..\..\libs\module\CoreModule.h" />
+    <ClInclude Include="..\..\libs\module\StaticModule.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tools/msvc/properties/DarkRadiant Core Library.props b/tools/msvc/properties/DarkRadiant Core Library.props
index b3f71fddfd..1695876c24 100644
--- a/tools/msvc/properties/DarkRadiant Core Library.props	
+++ b/tools/msvc/properties/DarkRadiant Core Library.props	
@@ -10,7 +10,7 @@
       <AdditionalDependencies>advapi32.lib;Dbghelp.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;wsock32.lib;scenelib.lib;mathlib.lib;xmlutillib.lib;wxutillib.lib;modulelib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\radiant;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />