diff --git a/MPClient/DebugEditor.Designer.cs b/DebugEditor/DebugEditor.Designer.cs
similarity index 100%
rename from MPClient/DebugEditor.Designer.cs
rename to DebugEditor/DebugEditor.Designer.cs
diff --git a/MPClient/DebugEditor.cs b/DebugEditor/DebugEditor.cs
similarity index 100%
rename from MPClient/DebugEditor.cs
rename to DebugEditor/DebugEditor.cs
diff --git a/MPClient/DebugEditor.resx b/DebugEditor/DebugEditor.resx
similarity index 100%
rename from MPClient/DebugEditor.resx
rename to DebugEditor/DebugEditor.resx
diff --git a/MPClient/EditorConnection.cs b/DebugEditor/EditorConnection.cs
similarity index 100%
rename from MPClient/EditorConnection.cs
rename to DebugEditor/EditorConnection.cs
diff --git a/MPClient/EditorWindow.Designer.cs b/DebugEditor/EditorWindow.Designer.cs
similarity index 100%
rename from MPClient/EditorWindow.Designer.cs
rename to DebugEditor/EditorWindow.Designer.cs
diff --git a/MPClient/EditorWindow.cs b/DebugEditor/EditorWindow.cs
similarity index 100%
rename from MPClient/EditorWindow.cs
rename to DebugEditor/EditorWindow.cs
diff --git a/MPClient/EditorWindow.resx b/DebugEditor/EditorWindow.resx
similarity index 100%
rename from MPClient/EditorWindow.resx
rename to DebugEditor/EditorWindow.resx
diff --git a/MPClient/Program.cs b/DebugEditor/Program.cs
similarity index 88%
rename from MPClient/Program.cs
rename to DebugEditor/Program.cs
index c670b671..4b13a202 100644
--- a/MPClient/Program.cs
+++ b/DebugEditor/Program.cs
@@ -15,7 +15,8 @@ namespace FalloutClient {
             if (args.Length == 1 && args[0] == "-debugedit") {
                 Application.Run(new DebugEditor(new EditorConnection()));
             } else {
-                MessageBox.Show("The debug editor can only be run from the game.",
+                MessageBox.Show("The debug editor can only be run from the game.\n" +
+                    "Use the key assigned to the DebugEditorKey option in ddraw.ini to run the debugger.",
                     "sfall Debug Editor", MessageBoxButtons.OK, MessageBoxIcon.Stop);
             }
         }
diff --git a/MPClient/Properties/AssemblyInfo.cs b/DebugEditor/Properties/AssemblyInfo.cs
similarity index 100%
rename from MPClient/Properties/AssemblyInfo.cs
rename to DebugEditor/Properties/AssemblyInfo.cs
diff --git a/MPClient/README.md b/DebugEditor/README.md
similarity index 100%
rename from MPClient/README.md
rename to DebugEditor/README.md
diff --git a/MPClient/SfallDebugEditor.csproj b/DebugEditor/SfallDebugEditor.csproj
similarity index 97%
rename from MPClient/SfallDebugEditor.csproj
rename to DebugEditor/SfallDebugEditor.csproj
index 06709b9e..47e973b5 100644
--- a/MPClient/SfallDebugEditor.csproj
+++ b/DebugEditor/SfallDebugEditor.csproj
@@ -9,14 +9,13 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FalloutClient</RootNamespace>
-    <AssemblyName>FalloutClient</AssemblyName>
+    <AssemblyName>FalloutDebug</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -29,6 +28,7 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>false</BootstrapperEnabled>
   </PropertyGroup>
@@ -42,14 +42,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/MPClient/SfallDebugEditor.sln b/DebugEditor/SfallDebugEditor.sln
similarity index 100%
rename from MPClient/SfallDebugEditor.sln
rename to DebugEditor/SfallDebugEditor.sln
diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini
index edb9f853..3ef40800 100644
--- a/artifacts/ddraw.ini
+++ b/artifacts/ddraw.ini
@@ -214,7 +214,7 @@ FastMoveFromContainer=0
 
 ;A key to press to open a debug game editor
 ;Set to 0 to disable, or a DX scancode otherwise
-;Requires sfall debugging mode and FalloutClient.exe from the modders pack
+;Requires sfall debugging mode and FalloutDebug.exe from the modders pack
 DebugEditorKey=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/sfall/Modules/DebugEditor.cpp b/sfall/Modules/DebugEditor.cpp
index 7a497c67..077621f8 100644
--- a/sfall/Modules/DebugEditor.cpp
+++ b/sfall/Modules/DebugEditor.cpp
@@ -273,7 +273,7 @@ void RunDebugEditor() {
 
 	si.cb = sizeof(si);
 
-	if (!CreateProcessA("FalloutClient.exe", "FalloutClient.exe -debugedit", 0, 0, false, 0, 0, 0, &si, &pi)) {
+	if (!CreateProcessA("FalloutDebug.exe", "FalloutDebug.exe -debugedit", 0, 0, false, 0, 0, 0, &si, &pi)) {
 		closesocket(sock);
 		WSACleanup();
 		return;