diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 88394a61c5..8193fbdd8e 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -605,12 +605,6 @@
       <DependentUpon>RomStatusPicker.cs</DependentUpon>
     </Compile>
     <Compile Include="Throttle.cs" />
-    <Compile Include="tools\Atari2600\AddBreakpointDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="tools\Atari2600\AddBreakpointDialog.Designer.cs">
-      <DependentUpon>AddBreakpointDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="tools\Atari2600\Atari2600Debugger.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -636,6 +630,12 @@
     <Compile Include="tools\Cheats\Cheats.Designer.cs">
       <DependentUpon>Cheats.cs</DependentUpon>
     </Compile>
+    <Compile Include="tools\Debugger\AddBreakpointDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\Debugger\AddBreakpointDialog.Designer.cs">
+      <DependentUpon>AddBreakpointDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\Debugger\Breakpoint.cs" />
     <Compile Include="tools\Debugger\BreakpointControl.cs">
       <SubType>UserControl</SubType>
@@ -1220,9 +1220,6 @@
     <EmbeddedResource Include="RomStatusPicker.resx">
       <DependentUpon>RomStatusPicker.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\Atari2600\AddBreakpointDialog.resx">
-      <DependentUpon>AddBreakpointDialog.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\Atari2600\Atari2600Debugger.resx">
       <DependentUpon>Atari2600Debugger.cs</DependentUpon>
     </EmbeddedResource>
@@ -1235,6 +1232,9 @@
     <EmbeddedResource Include="tools\Cheats\Cheats.resx">
       <DependentUpon>Cheats.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\Debugger\AddBreakpointDialog.resx">
+      <DependentUpon>AddBreakpointDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\Debugger\BreakpointControl.resx">
       <DependentUpon>BreakpointControl.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/BizHawk.Client.EmuHawk/tools/Atari2600/AddBreakpointDialog.Designer.cs b/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Atari2600/AddBreakpointDialog.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/Atari2600/AddBreakpointDialog.cs b/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Atari2600/AddBreakpointDialog.cs
rename to BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs
diff --git a/BizHawk.Client.EmuHawk/tools/Atari2600/AddBreakpointDialog.resx b/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Atari2600/AddBreakpointDialog.resx
rename to BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.resx