diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 442ca9a905..75740c1526 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -420,6 +420,7 @@
     <Compile Include="tools\HexEditor\HexFind.Designer.cs">
       <DependentUpon>HexFind.cs</DependentUpon>
     </Compile>
+    <Compile Include="tools\HexEditor\MemoryViewer.cs" />
     <Compile Include="tools\Lua\LuaButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -823,6 +824,9 @@
     <EmbeddedResource Include="tools\HexEditor\HexFind.resx">
       <DependentUpon>HexFind.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\HexEditor\MemoryViewer.resx">
+      <DependentUpon>MemoryViewer.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\Lua\LuaConsole.resx">
       <DependentUpon>LuaConsole.cs</DependentUpon>
     </EmbeddedResource>
@@ -940,9 +944,6 @@
     <Compile Include="Properties\svnrev.cs" />
     <Compile Include="SavestateManager.cs" />
     <Compile Include="Throttle.cs" />
-    <Compile Include="tools\MemoryViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\InputPrompt.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1020,10 +1021,6 @@
     <EmbeddedResource Include="tools\TraceLogger.resx">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\MemoryViewer.resx">
-      <DependentUpon>MemoryViewer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\InputPrompt.resx">
       <DependentUpon>InputPrompt.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
index a066ab7016..745962f2a3 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
@@ -422,6 +422,7 @@
     <Compile Include="tools\HexEditor\HexFind.Designer.cs">
       <DependentUpon>HexFind.cs</DependentUpon>
     </Compile>
+    <Compile Include="tools\HexEditor\MemoryViewer.cs" />
     <Compile Include="tools\Lua\LuaButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -825,6 +826,9 @@
     <EmbeddedResource Include="tools\HexEditor\HexFind.resx">
       <DependentUpon>HexFind.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\HexEditor\MemoryViewer.resx">
+      <DependentUpon>MemoryViewer.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\Lua\LuaConsole.resx">
       <DependentUpon>LuaConsole.cs</DependentUpon>
     </EmbeddedResource>
@@ -942,9 +946,6 @@
     <Compile Include="Properties\svnrev.cs" />
     <Compile Include="SavestateManager.cs" />
     <Compile Include="Throttle.cs" />
-    <Compile Include="tools\MemoryViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\InputPrompt.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1022,10 +1023,6 @@
     <EmbeddedResource Include="tools\TraceLogger.resx">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\MemoryViewer.resx">
-      <DependentUpon>MemoryViewer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\InputPrompt.resx">
       <DependentUpon>InputPrompt.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/BizHawk.MultiClient/tools/MemoryViewer.cs b/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/MemoryViewer.cs
rename to BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs
diff --git a/BizHawk.MultiClient/tools/MemoryViewer.resx b/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/MemoryViewer.resx
rename to BizHawk.MultiClient/tools/HexEditor/MemoryViewer.resx