diff --git a/radiant/Makefile.am b/radiant/Makefile.am
index caba533a04..c716496f25 100644
--- a/radiant/Makefile.am
+++ b/radiant/Makefile.am
@@ -229,7 +229,7 @@ darkradiant_SOURCES = main.cpp \
                       ui/overlay/OverlayDialog.cpp \
                       ui/overlay/Overlay.cpp \
                       ui/splash/Splash.cpp \
-					  ui/grid/GridManager.cpp \
+					  ui/grid/GridUserInterface.cpp \
                       ui/mru/MRUMenuItem.cpp \
                       ui/mru/MRU.cpp \
                       ui/layers/LayerControl.cpp \
diff --git a/radiant/ui/grid/GridUserInterface.cpp b/radiant/ui/grid/GridUserInterface.cpp
index c69c153b5f..35b50f3359 100644
--- a/radiant/ui/grid/GridUserInterface.cpp
+++ b/radiant/ui/grid/GridUserInterface.cpp
@@ -55,6 +55,9 @@ void GridUserInterface::initialiseModule(const ApplicationContext& ctx)
 
 		GlobalEventManager().setToggled(toggleName, GlobalGrid().getGridPower() == size);
 	}
+
+	GlobalEventManager().addCommand("GridDown", "GridDown");
+	GlobalEventManager().addCommand("GridUp", "GridUp");
 }
 
 void GridUserInterface::shutdownModule()
diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
index 5b14d402ab..9aa43133a1 100644
--- a/radiantcore/Makefile.am
+++ b/radiantcore/Makefile.am
@@ -34,6 +34,7 @@ libradiantcore_la_LDFLAGS = -module -avoid-version \
 libradiantcore_la_SOURCES = Radiant.cpp \
                 commandsystem/CommandSystem.cpp \
                 filetypes/FileTypeRegistry.cpp \
+                grid/GridManager.cpp \
                 imagefile/dds.cpp \
                 imagefile/ddslib.cpp \
                 imagefile/DDSImage.cpp \
diff --git a/radiant/ui/grid/GridItem.h b/radiantcore/grid/GridItem.h
similarity index 100%
rename from radiant/ui/grid/GridItem.h
rename to radiantcore/grid/GridItem.h
diff --git a/radiant/ui/grid/GridManager.cpp b/radiantcore/grid/GridManager.cpp
similarity index 98%
rename from radiant/ui/grid/GridManager.cpp
rename to radiantcore/grid/GridManager.cpp
index adca8e09b0..687000b1da 100644
--- a/radiant/ui/grid/GridManager.cpp
+++ b/radiantcore/grid/GridManager.cpp
@@ -113,9 +113,6 @@ void GridManager::registerCommands()
 
 	GlobalCommandSystem().addCommand("GridDown", std::bind(&GridManager::gridDownCmd, this, std::placeholders::_1));
 	GlobalCommandSystem().addCommand("GridUp", std::bind(&GridManager::gridUpCmd, this, std::placeholders::_1));
-
-	GlobalEventManager().addCommand("GridDown", "GridDown");
-	GlobalEventManager().addCommand("GridUp", "GridUp");
 }
 
 ComboBoxValueList GridManager::getGridList()
diff --git a/radiant/ui/grid/GridManager.h b/radiantcore/grid/GridManager.h
similarity index 100%
rename from radiant/ui/grid/GridManager.h
rename to radiantcore/grid/GridManager.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index 1ee3eca814..07d4cdccb8 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -813,7 +813,6 @@
     <ClCompile Include="..\..\radiant\ui\filters\FilterContextMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterOrthoContextMenuItem.cpp" />
-    <ClCompile Include="..\..\radiant\ui\grid\GridManager.cpp" />
     <ClCompile Include="..\..\radiant\ui\grid\GridUserInterface.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\TopLevelFrame.cpp" />
     <ClCompile Include="..\..\radiant\ui\mapinfo\LayerInfoTab.cpp" />
@@ -1238,8 +1237,6 @@
     <ClInclude Include="..\..\radiant\ui\filters\FilterContextMenu.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterMenu.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterOrthoContextMenuItem.h" />
-    <ClInclude Include="..\..\radiant\ui\grid\GridItem.h" />
-    <ClInclude Include="..\..\radiant\ui\grid\GridManager.h" />
     <ClInclude Include="..\..\radiant\ui\grid\GridUserInterface.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\TopLevelFrame.h" />
     <ClInclude Include="..\..\radiant\ui\mapinfo\LayerInfoTab.h" />
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index b8e19ae4ba..693193ee8d 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -934,9 +934,6 @@
     <ClCompile Include="..\..\radiant\model\ScaledModelExporter.cpp">
       <Filter>src\model</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\grid\GridManager.cpp">
-      <Filter>src\ui\grid</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\model\ModelExporter.cpp">
       <Filter>src\model</Filter>
     </ClCompile>
@@ -2316,12 +2313,6 @@
     <ClInclude Include="..\..\radiant\model\ScaledModelExporter.h">
       <Filter>src\model</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\grid\GridItem.h">
-      <Filter>src\ui\grid</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\grid\GridManager.h">
-      <Filter>src\ui\grid</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\model\ModelExporter.h">
       <Filter>src\model</Filter>
     </ClInclude>
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index 91712f3a8e..269fabb9b2 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -20,6 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\filetypes\FileTypeRegistry.cpp" />
+    <ClCompile Include="..\..\radiantcore\grid\GridManager.cpp" />
     <ClCompile Include="..\..\radiantcore\imagefile\dds.cpp" />
     <ClCompile Include="..\..\radiantcore\imagefile\DDSImage.cpp" />
     <ClCompile Include="..\..\radiantcore\imagefile\ddslib.cpp" />
@@ -59,6 +60,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\filetypes\FileTypeRegistry.h" />
+    <ClInclude Include="..\..\radiantcore\grid\GridItem.h" />
+    <ClInclude Include="..\..\radiantcore\grid\GridManager.h" />
     <ClInclude Include="..\..\radiantcore\imagefile\dds.h" />
     <ClInclude Include="..\..\radiantcore\imagefile\DDSImage.h" />
     <ClInclude Include="..\..\radiantcore\imagefile\ddslib.h" />
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index 69eca61a4a..18b1b95b24 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -47,6 +47,9 @@
     <Filter Include="src\skins">
       <UniqueIdentifier>{5ba83911-a3f4-4f34-8ca2-b498fa0c57bc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\grid">
+      <UniqueIdentifier>{79fa6073-1042-4501-9f3f-34c689eaf391}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -160,6 +163,9 @@
     <ClCompile Include="..\..\radiantcore\skins\Doom3SkinCache.cpp">
       <Filter>src\skins</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\grid\GridManager.cpp">
+      <Filter>src\grid</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -351,5 +357,11 @@
     <ClInclude Include="..\..\radiantcore\skins\Doom3SkinCache.h">
       <Filter>src\skins</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\grid\GridItem.h">
+      <Filter>src\grid</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\grid\GridManager.h">
+      <Filter>src\grid</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file