diff --git a/include/iuimanager.h b/include/iuimanager.h
index 5c3815c761..d457a81921 100644
--- a/include/iuimanager.h
+++ b/include/iuimanager.h
@@ -33,8 +33,6 @@ namespace ui
 	};
 } // namespace ui
 
-/** greebo: Implementation documentation: see MenuManager.h.
- */
 class IMenuManager
 {
 public:
diff --git a/plugins/uimanager/Makefile.am b/plugins/uimanager/Makefile.am
index 7ff482836c..3298b75098 100644
--- a/plugins/uimanager/Makefile.am
+++ b/plugins/uimanager/Makefile.am
@@ -15,19 +15,19 @@ uimanager_la_LIBADD = $(top_builddir)/libs/wxutil/libwxutil.la \
                       $(top_builddir)/libs/math/libmath.la \
                       $(top_builddir)/libs/scene/libscenegraph.la \
                       $(top_builddir)/libs/xmlutil/libxmlutil.la
-uimanager_la_SOURCES = MenuItem.cpp \
-                       GroupDialog.cpp \
+uimanager_la_SOURCES = GroupDialog.cpp \
 					   animationpreview/MD5AnimationChooser.cpp \
 					   animationpreview/MD5AnimationViewer.cpp \
 					   animationpreview/AnimationPreview.cpp \
                        colourscheme/ColourScheme.cpp \
                        colourscheme/ColourSchemeEditor.cpp \
                        colourscheme/ColourSchemeManager.cpp \
+					   menu/MenuItem.cpp \
+					   menu/MenuManager.cpp \
 					   SoundChooser.cpp \
 					   SoundShaderPreview.cpp \
                        StatusBarManager.cpp \
                        DialogManager.cpp \
                        ToolbarManager.cpp \
                        UIManager.cpp \
-                       FilterMenu.cpp \
-                       MenuManager.cpp
+                       FilterMenu.cpp
diff --git a/plugins/uimanager/MenuItem.cpp b/plugins/uimanager/menu/MenuItem.cpp
similarity index 100%
rename from plugins/uimanager/MenuItem.cpp
rename to plugins/uimanager/menu/MenuItem.cpp
diff --git a/plugins/uimanager/MenuItem.h b/plugins/uimanager/menu/MenuItem.h
similarity index 100%
rename from plugins/uimanager/MenuItem.h
rename to plugins/uimanager/menu/MenuItem.h
diff --git a/plugins/uimanager/MenuManager.cpp b/plugins/uimanager/menu/MenuManager.cpp
similarity index 99%
rename from plugins/uimanager/MenuManager.cpp
rename to plugins/uimanager/menu/MenuManager.cpp
index 5447aa2668..6893050c5b 100644
--- a/plugins/uimanager/MenuManager.cpp
+++ b/plugins/uimanager/menu/MenuManager.cpp
@@ -18,7 +18,6 @@ namespace
 	// The menu root key in the registry
 	const std::string RKEY_MENU_ROOT = "user/ui/menu";
 	const std::string TYPE_ITEM = "item";
-	typedef std::vector<std::string> StringVector;
 }
 
 MenuManager::MenuManager() :
diff --git a/plugins/uimanager/MenuManager.h b/plugins/uimanager/menu/MenuManager.h
similarity index 100%
rename from plugins/uimanager/MenuManager.h
rename to plugins/uimanager/menu/MenuManager.h
diff --git a/tools/msvc2015/uimanager.vcxproj b/tools/msvc2015/uimanager.vcxproj
index 79ccc9bee2..6a41aa804f 100644
--- a/tools/msvc2015/uimanager.vcxproj
+++ b/tools/msvc2015/uimanager.vcxproj
@@ -325,8 +325,8 @@
     <ClCompile Include="..\..\plugins\uimanager\DialogManager.cpp" />
     <ClCompile Include="..\..\plugins\uimanager\FilterMenu.cpp" />
     <ClCompile Include="..\..\plugins\uimanager\GroupDialog.cpp" />
-    <ClCompile Include="..\..\plugins\uimanager\MenuItem.cpp" />
-    <ClCompile Include="..\..\plugins\uimanager\MenuManager.cpp" />
+    <ClCompile Include="..\..\plugins\uimanager\menu\MenuItem.cpp" />
+    <ClCompile Include="..\..\plugins\uimanager\menu\MenuManager.cpp" />
     <ClCompile Include="..\..\plugins\uimanager\SoundChooser.cpp" />
     <ClCompile Include="..\..\plugins\uimanager\SoundShaderPreview.cpp" />
     <ClCompile Include="..\..\plugins\uimanager\StatusBarManager.cpp" />
@@ -344,8 +344,8 @@
     <ClInclude Include="..\..\plugins\uimanager\FilterMenu.h" />
     <ClInclude Include="..\..\plugins\uimanager\GroupDialog.h" />
     <ClInclude Include="..\..\plugins\uimanager\LocalBitmapArtProvider.h" />
-    <ClInclude Include="..\..\plugins\uimanager\MenuItem.h" />
-    <ClInclude Include="..\..\plugins\uimanager\MenuManager.h" />
+    <ClInclude Include="..\..\plugins\uimanager\menu\MenuItem.h" />
+    <ClInclude Include="..\..\plugins\uimanager\menu\MenuManager.h" />
     <ClInclude Include="..\..\plugins\uimanager\SoundChooser.h" />
     <ClInclude Include="..\..\plugins\uimanager\SoundShaderPreview.h" />
     <ClInclude Include="..\..\plugins\uimanager\StatusBarManager.h" />
diff --git a/tools/msvc2015/uimanager.vcxproj.filters b/tools/msvc2015/uimanager.vcxproj.filters
index ba150bbe5e..f39654cfaa 100644
--- a/tools/msvc2015/uimanager.vcxproj.filters
+++ b/tools/msvc2015/uimanager.vcxproj.filters
@@ -11,6 +11,9 @@
     <Filter Include="src\animationpreview">
       <UniqueIdentifier>{76d19dfa-2eef-475e-a743-e99b86aa0d2f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\menu">
+      <UniqueIdentifier>{be0c6eeb-cb4b-494a-a99b-7db2abeec7ea}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\plugins\uimanager\DialogManager.cpp">
@@ -22,12 +25,6 @@
     <ClCompile Include="..\..\plugins\uimanager\GroupDialog.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\plugins\uimanager\MenuItem.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\plugins\uimanager\MenuManager.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\plugins\uimanager\StatusBarManager.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -61,6 +58,12 @@
     <ClCompile Include="..\..\plugins\uimanager\animationpreview\MD5AnimationChooser.cpp">
       <Filter>src\animationpreview</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\plugins\uimanager\menu\MenuItem.cpp">
+      <Filter>src\menu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\plugins\uimanager\menu\MenuManager.cpp">
+      <Filter>src\menu</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\plugins\uimanager\DialogManager.h">
@@ -72,12 +75,6 @@
     <ClInclude Include="..\..\plugins\uimanager\GroupDialog.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\plugins\uimanager\MenuItem.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\plugins\uimanager\MenuManager.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\plugins\uimanager\StatusBarManager.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -114,6 +111,12 @@
     <ClInclude Include="..\..\plugins\uimanager\animationpreview\MD5AnimationChooser.h">
       <Filter>src\animationpreview</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\plugins\uimanager\menu\MenuItem.h">
+      <Filter>src\menu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\plugins\uimanager\menu\MenuManager.h">
+      <Filter>src\menu</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\plugins\uimanager\uimanager.def">