diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
index 514d309019..a838131bf2 100644
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@ -12,7 +12,6 @@ add_executable(darkradiant
                eventmanager/Statement.cpp
                eventmanager/Toggle.cpp
                eventmanager/WidgetToggle.cpp
-               log/Console.cpp
                main.cpp
                map/AutoSaveTimer.cpp
                map/StartupMapLoader.cpp
@@ -33,7 +32,6 @@ add_executable(darkradiant
                ui/brush/QuerySidesDialog.cpp
                ui/commandlist/CommandList.cpp
                ui/commandlist/ShortcutChooser.cpp
-               ui/common/CommandEntry.cpp
                ui/common/EntityChooser.cpp
                ui/common/ImageFilePopulator.cpp
                ui/common/ImageFileSelector.cpp
@@ -44,6 +42,8 @@ add_executable(darkradiant
                ui/common/SkinChooser.cpp
                ui/common/SoundChooser.cpp
                ui/common/SoundShaderPreview.cpp
+               ui/console/CommandEntry.cpp
+               ui/console/Console.cpp
                ui/DispatchEvent.cpp
                ui/Documentation.cpp
                ui/eclasstree/EClassTreeBuilder.cpp
diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
index 1c71e381d6..0322d1db17 100644
--- a/radiant/ui/UserInterfaceModule.cpp
+++ b/radiant/ui/UserInterfaceModule.cpp
@@ -35,7 +35,7 @@
 #include "ui/overlay/OverlayDialog.h"
 #include "ui/prefdialog/PrefDialog.h"
 #include "ui/Documentation.h"
-#include "log/Console.h"
+#include "ui/console/Console.h"
 #include "ui/lightinspector/LightInspector.h"
 #include "ui/patch/PatchInspector.h"
 #include "ui/surfaceinspector/SurfaceInspector.h"
diff --git a/radiant/ui/common/CommandEntry.cpp b/radiant/ui/console/CommandEntry.cpp
similarity index 100%
rename from radiant/ui/common/CommandEntry.cpp
rename to radiant/ui/console/CommandEntry.cpp
diff --git a/radiant/ui/common/CommandEntry.h b/radiant/ui/console/CommandEntry.h
similarity index 100%
rename from radiant/ui/common/CommandEntry.h
rename to radiant/ui/console/CommandEntry.h
diff --git a/radiant/log/Console.cpp b/radiant/ui/console/Console.cpp
similarity index 100%
rename from radiant/log/Console.cpp
rename to radiant/ui/console/Console.cpp
diff --git a/radiant/log/Console.h b/radiant/ui/console/Console.h
similarity index 97%
rename from radiant/log/Console.h
rename to radiant/ui/console/Console.h
index 9876a697a0..009e1b3daf 100644
--- a/radiant/log/Console.h
+++ b/radiant/ui/console/Console.h
@@ -6,7 +6,7 @@
 #include <wx/panel.h>
 
 #include "wxutil/ConsoleView.h"
-#include "ui/common/CommandEntry.h"
+#include "CommandEntry.h"
 
 namespace ui
 {
diff --git a/radiant/ui/mainframe/MainFrame.cpp b/radiant/ui/mainframe/MainFrame.cpp
index 8634b30b92..628668554c 100644
--- a/radiant/ui/mainframe/MainFrame.cpp
+++ b/radiant/ui/mainframe/MainFrame.cpp
@@ -11,7 +11,7 @@
 #include "iregistry.h"
 #include "iradiant.h"
 
-#include "log/Console.h"
+#include "ui/console/Console.h"
 #include "xyview/GlobalXYWnd.h"
 #include "camera/CameraWndManager.h"
 
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index 5aec0c6575..410eee93de 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -235,6 +235,8 @@
     <ClCompile Include="..\..\radiant\ui\common\SkinChooser.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\SoundChooser.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\SoundShaderPreview.cpp" />
+    <ClCompile Include="..\..\radiant\ui\console\CommandEntry.cpp" />
+    <ClCompile Include="..\..\radiant\ui\console\Console.cpp" />
     <ClCompile Include="..\..\radiant\ui\DispatchEvent.cpp" />
     <ClCompile Include="..\..\radiant\ui\Documentation.cpp" />
     <ClCompile Include="..\..\radiant\ui\eclasstree\EClassTree.cpp" />
@@ -285,7 +287,6 @@
     <ClCompile Include="..\..\radiant\ui\about\AboutDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\commandlist\CommandList.cpp" />
     <ClCompile Include="..\..\radiant\ui\commandlist\ShortcutChooser.cpp" />
-    <ClCompile Include="..\..\radiant\ui\common\CommandEntry.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\EntityChooser.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\MapPreview.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\ShaderChooser.cpp" />
@@ -369,7 +370,6 @@
     <ClCompile Include="..\..\radiant\xyview\tools\ClipperTool.cpp" />
     <ClCompile Include="..\..\radiant\xyview\tools\MeasurementTool.cpp" />
     <ClCompile Include="..\..\radiant\xyview\XYWnd.cpp" />
-    <ClCompile Include="..\..\radiant\log\Console.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\ApplicationContext.h" />
@@ -426,6 +426,8 @@
     <ClInclude Include="..\..\radiant\ui\common\SkinChooser.h" />
     <ClInclude Include="..\..\radiant\ui\common\SoundChooser.h" />
     <ClInclude Include="..\..\radiant\ui\common\SoundShaderPreview.h" />
+    <ClInclude Include="..\..\radiant\ui\console\CommandEntry.h" />
+    <ClInclude Include="..\..\radiant\ui\console\Console.h" />
     <ClInclude Include="..\..\radiant\ui\DispatchEvent.h" />
     <ClInclude Include="..\..\radiant\ui\Documentation.h" />
     <ClInclude Include="..\..\radiant\ui\eclasstree\EClassTree.h" />
@@ -491,7 +493,6 @@
     <ClInclude Include="..\..\radiant\ui\commandlist\CommandList.h" />
     <ClInclude Include="..\..\radiant\ui\commandlist\CommandListPopulator.h" />
     <ClInclude Include="..\..\radiant\ui\commandlist\ShortcutChooser.h" />
-    <ClInclude Include="..\..\radiant\ui\common\CommandEntry.h" />
     <ClInclude Include="..\..\radiant\ui\common\EntityChooser.h" />
     <ClInclude Include="..\..\radiant\ui\common\MapPreview.h" />
     <ClInclude Include="..\..\radiant\ui\common\ShaderChooser.h" />
@@ -590,7 +591,6 @@
     <ClInclude Include="..\..\radiant\xyview\tools\ZoomTool.h" />
     <ClInclude Include="..\..\radiant\xyview\XYRenderer.h" />
     <ClInclude Include="..\..\radiant\xyview\XYWnd.h" />
-    <ClInclude Include="..\..\radiant\log\Console.h" />
     <ClInclude Include="..\..\radiant\log\PIDFile.h" />
     <ClInclude Include="..\..\radiant\log\PopupErrorHandler.h" />
   </ItemGroup>
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index 07832a0665..ea40ca631e 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -188,6 +188,9 @@
     <Filter Include="src\textool\tools">
       <UniqueIdentifier>{05468cce-ffef-47f1-9a5e-d4278f0ae3c4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\ui\console">
+      <UniqueIdentifier>{66e30145-e977-405c-9507-fc783318215a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiant\main.cpp">
@@ -214,9 +217,6 @@
     <ClCompile Include="..\..\radiant\ui\commandlist\ShortcutChooser.cpp">
       <Filter>src\ui\commandlist</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\common\CommandEntry.cpp">
-      <Filter>src\ui\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\common\EntityChooser.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
@@ -382,9 +382,6 @@
     <ClCompile Include="..\..\radiant\xyview\XYWnd.cpp">
       <Filter>src\xyview</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\log\Console.cpp">
-      <Filter>src\log</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\precompiled.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -703,6 +700,12 @@
     <ClCompile Include="..\..\radiant\ui\common\SkinChooser.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\console\CommandEntry.cpp">
+      <Filter>src\ui\console</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\console\Console.cpp">
+      <Filter>src\ui\console</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -729,9 +732,6 @@
     <ClInclude Include="..\..\radiant\ui\commandlist\ShortcutChooser.h">
       <Filter>src\ui\commandlist</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\common\CommandEntry.h">
-      <Filter>src\ui\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\common\EntityChooser.h">
       <Filter>src\ui\common</Filter>
     </ClInclude>
@@ -915,9 +915,6 @@
     <ClInclude Include="..\..\radiant\xyview\XYWnd.h">
       <Filter>src\xyview</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\log\Console.h">
-      <Filter>src\log</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\log\PIDFile.h">
       <Filter>src\log</Filter>
     </ClInclude>
@@ -1368,6 +1365,12 @@
     <ClInclude Include="..\..\radiant\ui\common\SkinChooser.h">
       <Filter>src\ui\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\console\CommandEntry.h">
+      <Filter>src\ui\console</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\console\Console.h">
+      <Filter>src\ui\console</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />