diff --git a/.gitignore b/.gitignore
index 59a33272..7349e69f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,16 @@
 /.vs
-/DATabase/obj
-/DATabase/obj/Debug
-/DATabase/obj/Release
 /Deheader/obj
 /Deheader/obj/Debug
 /Deheader/obj/Release
 /OfflineMerge/obj
 /OfflineMerge/obj/Debug
 /OfflineMerge/obj/Release
-/SabreHelper/obj
-/SabreHelper/obj/Debug
-/SabreHelper/obj/Release
+/SabreTools/obj
+/SabreTools/obj/Debug
+/SabreTools/obj/Release
+/SabreTools.Helper/obj
+/SabreTools.Helper/obj/Debug
+/SabreTools.Helper/obj/Release
 /SabreToolsUI/obj
 /SabreToolsUI/obj/Debug
 /SabreToolsUI/obj/Release
\ No newline at end of file
diff --git a/Deheader/Headerer.csproj b/Deheader/Headerer.csproj
index 0525ed47..9c618973 100644
--- a/Deheader/Headerer.csproj
+++ b/Deheader/Headerer.csproj
@@ -95,7 +95,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SabreHelper\SabreTools.Helper.csproj">
+    <ProjectReference Include="..\SabreTools.Helper\SabreTools.Helper.csproj">
       <Project>{225a1afd-0890-44e8-b779-7502665c23a5}</Project>
       <Name>SabreTools.Helper</Name>
     </ProjectReference>
diff --git a/OfflineMerge/OfflineMerge.csproj b/OfflineMerge/OfflineMerge.csproj
index 30572cf0..46af5009 100644
--- a/OfflineMerge/OfflineMerge.csproj
+++ b/OfflineMerge/OfflineMerge.csproj
@@ -70,7 +70,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SabreHelper\SabreTools.Helper.csproj">
+    <ProjectReference Include="..\SabreTools.Helper\SabreTools.Helper.csproj">
       <Project>{225a1afd-0890-44e8-b779-7502665c23a5}</Project>
       <Name>SabreTools.Helper</Name>
     </ProjectReference>
diff --git a/README.MD b/README.MD
index 62ddf7c8..5ba6157e 100644
--- a/README.MD
+++ b/README.MD
@@ -16,7 +16,7 @@ A bare-bones attempt at providing a true GUI experience for the SabreTools suite
 </ul>
 This tool is not recommended for any usage.
 
-<b>DATabase</b>
+<b>SabreTools</b> (formerly <i>DATabase</i>)
 <p/>
 The main tool of the SabreTools suite. Performs the majority of the core features of the parent project, including the following:
 <ul>
diff --git a/SabreHelper/AnyCPU/sqlite3.dll b/SabreTools.Helper/AnyCPU/sqlite3.dll
similarity index 100%
rename from SabreHelper/AnyCPU/sqlite3.dll
rename to SabreTools.Helper/AnyCPU/sqlite3.dll
diff --git a/SabreHelper/Data/Build.cs b/SabreTools.Helper/Data/Build.cs
similarity index 100%
rename from SabreHelper/Data/Build.cs
rename to SabreTools.Helper/Data/Build.cs
diff --git a/SabreHelper/Data/Constants.cs b/SabreTools.Helper/Data/Constants.cs
similarity index 100%
rename from SabreHelper/Data/Constants.cs
rename to SabreTools.Helper/Data/Constants.cs
diff --git a/SabreHelper/Data/Enums.cs b/SabreTools.Helper/Data/Enums.cs
similarity index 100%
rename from SabreHelper/Data/Enums.cs
rename to SabreTools.Helper/Data/Enums.cs
diff --git a/SabreHelper/Data/Structs.cs b/SabreTools.Helper/Data/Structs.cs
similarity index 100%
rename from SabreHelper/Data/Structs.cs
rename to SabreTools.Helper/Data/Structs.cs
diff --git a/SabreHelper/Interfaces/IGenerate.cs b/SabreTools.Helper/Interfaces/IGenerate.cs
similarity index 100%
rename from SabreHelper/Interfaces/IGenerate.cs
rename to SabreTools.Helper/Interfaces/IGenerate.cs
diff --git a/SabreHelper/Interfaces/IImport.cs b/SabreTools.Helper/Interfaces/IImport.cs
similarity index 100%
rename from SabreHelper/Interfaces/IImport.cs
rename to SabreTools.Helper/Interfaces/IImport.cs
diff --git a/SabreHelper/LICENSE b/SabreTools.Helper/LICENSE
similarity index 100%
rename from SabreHelper/LICENSE
rename to SabreTools.Helper/LICENSE
diff --git a/SabreHelper/Logger.cs b/SabreTools.Helper/Logger.cs
similarity index 100%
rename from SabreHelper/Logger.cs
rename to SabreTools.Helper/Logger.cs
diff --git a/SabreHelper/Mappings/Good.xml b/SabreTools.Helper/Mappings/Good.xml
similarity index 100%
rename from SabreHelper/Mappings/Good.xml
rename to SabreTools.Helper/Mappings/Good.xml
diff --git a/SabreHelper/Mappings/MAME.xml b/SabreTools.Helper/Mappings/MAME.xml
similarity index 100%
rename from SabreHelper/Mappings/MAME.xml
rename to SabreTools.Helper/Mappings/MAME.xml
diff --git a/SabreHelper/Mappings/MaybeIntro.xml b/SabreTools.Helper/Mappings/MaybeIntro.xml
similarity index 100%
rename from SabreHelper/Mappings/MaybeIntro.xml
rename to SabreTools.Helper/Mappings/MaybeIntro.xml
diff --git a/SabreHelper/Mappings/NoIntro.xml b/SabreTools.Helper/Mappings/NoIntro.xml
similarity index 100%
rename from SabreHelper/Mappings/NoIntro.xml
rename to SabreTools.Helper/Mappings/NoIntro.xml
diff --git a/SabreHelper/Mappings/NonGood.xml b/SabreTools.Helper/Mappings/NonGood.xml
similarity index 100%
rename from SabreHelper/Mappings/NonGood.xml
rename to SabreTools.Helper/Mappings/NonGood.xml
diff --git a/SabreHelper/Mappings/Redump.xml b/SabreTools.Helper/Mappings/Redump.xml
similarity index 100%
rename from SabreHelper/Mappings/Redump.xml
rename to SabreTools.Helper/Mappings/Redump.xml
diff --git a/SabreHelper/Mappings/TOSEC.xml b/SabreTools.Helper/Mappings/TOSEC.xml
similarity index 100%
rename from SabreHelper/Mappings/TOSEC.xml
rename to SabreTools.Helper/Mappings/TOSEC.xml
diff --git a/SabreHelper/Mappings/TruRip.xml b/SabreTools.Helper/Mappings/TruRip.xml
similarity index 100%
rename from SabreHelper/Mappings/TruRip.xml
rename to SabreTools.Helper/Mappings/TruRip.xml
diff --git a/SabreHelper/Properties/AssemblyInfo.cs b/SabreTools.Helper/Properties/AssemblyInfo.cs
similarity index 100%
rename from SabreHelper/Properties/AssemblyInfo.cs
rename to SabreTools.Helper/Properties/AssemblyInfo.cs
diff --git a/SabreHelper/Remapping.cs b/SabreTools.Helper/Remapping.cs
similarity index 100%
rename from SabreHelper/Remapping.cs
rename to SabreTools.Helper/Remapping.cs
diff --git a/SabreHelper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
similarity index 100%
rename from SabreHelper/SabreTools.Helper.csproj
rename to SabreTools.Helper/SabreTools.Helper.csproj
diff --git a/SabreHelper/Skippers/a7800.xml b/SabreTools.Helper/Skippers/a7800.xml
similarity index 100%
rename from SabreHelper/Skippers/a7800.xml
rename to SabreTools.Helper/Skippers/a7800.xml
diff --git a/SabreHelper/Skippers/fds.xml b/SabreTools.Helper/Skippers/fds.xml
similarity index 100%
rename from SabreHelper/Skippers/fds.xml
rename to SabreTools.Helper/Skippers/fds.xml
diff --git a/SabreHelper/Skippers/lynx.xml b/SabreTools.Helper/Skippers/lynx.xml
similarity index 100%
rename from SabreHelper/Skippers/lynx.xml
rename to SabreTools.Helper/Skippers/lynx.xml
diff --git a/SabreHelper/Skippers/n64.xml b/SabreTools.Helper/Skippers/n64.xml
similarity index 100%
rename from SabreHelper/Skippers/n64.xml
rename to SabreTools.Helper/Skippers/n64.xml
diff --git a/SabreHelper/Skippers/nes.xml b/SabreTools.Helper/Skippers/nes.xml
similarity index 100%
rename from SabreHelper/Skippers/nes.xml
rename to SabreTools.Helper/Skippers/nes.xml
diff --git a/SabreHelper/Skippers/pce.xml b/SabreTools.Helper/Skippers/pce.xml
similarity index 100%
rename from SabreHelper/Skippers/pce.xml
rename to SabreTools.Helper/Skippers/pce.xml
diff --git a/SabreHelper/Skippers/psid.xml b/SabreTools.Helper/Skippers/psid.xml
similarity index 100%
rename from SabreHelper/Skippers/psid.xml
rename to SabreTools.Helper/Skippers/psid.xml
diff --git a/SabreHelper/Skippers/snes.xml b/SabreTools.Helper/Skippers/snes.xml
similarity index 100%
rename from SabreHelper/Skippers/snes.xml
rename to SabreTools.Helper/Skippers/snes.xml
diff --git a/SabreHelper/Skippers/spc.xml b/SabreTools.Helper/Skippers/spc.xml
similarity index 100%
rename from SabreHelper/Skippers/spc.xml
rename to SabreTools.Helper/Skippers/spc.xml
diff --git a/SabreHelper/Tools/CRC32.cs b/SabreTools.Helper/Tools/CRC32.cs
similarity index 100%
rename from SabreHelper/Tools/CRC32.cs
rename to SabreTools.Helper/Tools/CRC32.cs
diff --git a/SabreHelper/Tools/DatTools.cs b/SabreTools.Helper/Tools/DatTools.cs
similarity index 100%
rename from SabreHelper/Tools/DatTools.cs
rename to SabreTools.Helper/Tools/DatTools.cs
diff --git a/SabreHelper/Tools/Database.cs b/SabreTools.Helper/Tools/Database.cs
similarity index 100%
rename from SabreHelper/Tools/Database.cs
rename to SabreTools.Helper/Tools/Database.cs
diff --git a/SabreHelper/Tools/Output.cs b/SabreTools.Helper/Tools/Output.cs
similarity index 100%
rename from SabreHelper/Tools/Output.cs
rename to SabreTools.Helper/Tools/Output.cs
diff --git a/SabreHelper/Tools/Stats.cs b/SabreTools.Helper/Tools/Stats.cs
similarity index 100%
rename from SabreHelper/Tools/Stats.cs
rename to SabreTools.Helper/Tools/Stats.cs
diff --git a/SabreHelper/Tools/Style.cs b/SabreTools.Helper/Tools/Style.cs
similarity index 100%
rename from SabreHelper/Tools/Style.cs
rename to SabreTools.Helper/Tools/Style.cs
diff --git a/SabreHelper/dats.sqlite b/SabreTools.Helper/dats.sqlite
similarity index 100%
rename from SabreHelper/dats.sqlite
rename to SabreTools.Helper/dats.sqlite
diff --git a/DATabase/packages.config b/SabreTools.Helper/packages.config
similarity index 100%
rename from DATabase/packages.config
rename to SabreTools.Helper/packages.config
diff --git a/SabreHelper/sqlite3.dll b/SabreTools.Helper/sqlite3.dll
similarity index 100%
rename from SabreHelper/sqlite3.dll
rename to SabreTools.Helper/sqlite3.dll
diff --git a/SabreHelper/x64/sqlite3.dll b/SabreTools.Helper/x64/sqlite3.dll
similarity index 100%
rename from SabreHelper/x64/sqlite3.dll
rename to SabreTools.Helper/x64/sqlite3.dll
diff --git a/SabreTools.sln b/SabreTools.sln
index e9ef2a69..2338f7b7 100644
--- a/SabreTools.sln
+++ b/SabreTools.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools", "DATabase\SabreTools.csproj", "{3B615702-1866-4D7B-8AF1-7B43FD0CC1D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools", "SabreTools\SabreTools.csproj", "{3B615702-1866-4D7B-8AF1-7B43FD0CC1D0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Headerer", "Deheader\Headerer.csproj", "{66339C8A-F331-467C-B311-08A8F7284671}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreToolsUI", "SabreToolsUI\SabreToolsUI.csproj", "{7DC54E53-4A46-4323-97E1-062EEFB7E4BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Helper", "SabreHelper\SabreTools.Helper.csproj", "{225A1AFD-0890-44E8-B779-7502665C23A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Helper", "SabreTools.Helper\SabreTools.Helper.csproj", "{225A1AFD-0890-44E8-B779-7502665C23A5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OfflineMerge", "OfflineMerge\OfflineMerge.csproj", "{88310DB9-3B64-4268-AD48-2E0358D4CA5F}"
 EndProject
diff --git a/DATabase/App.config b/SabreTools/App.config
similarity index 100%
rename from DATabase/App.config
rename to SabreTools/App.config
diff --git a/DATabase/DATFromDir.cs b/SabreTools/DATFromDir.cs
similarity index 100%
rename from DATabase/DATFromDir.cs
rename to SabreTools/DATFromDir.cs
diff --git a/DATabase/ImportExport/Generate.cs b/SabreTools/ImportExport/Generate.cs
similarity index 100%
rename from DATabase/ImportExport/Generate.cs
rename to SabreTools/ImportExport/Generate.cs
diff --git a/DATabase/ImportExport/GenerateTwo.cs b/SabreTools/ImportExport/GenerateTwo.cs
similarity index 100%
rename from DATabase/ImportExport/GenerateTwo.cs
rename to SabreTools/ImportExport/GenerateTwo.cs
diff --git a/DATabase/ImportExport/Import.cs b/SabreTools/ImportExport/Import.cs
similarity index 100%
rename from DATabase/ImportExport/Import.cs
rename to SabreTools/ImportExport/Import.cs
diff --git a/DATabase/ImportExport/ImportTwo.cs b/SabreTools/ImportExport/ImportTwo.cs
similarity index 100%
rename from DATabase/ImportExport/ImportTwo.cs
rename to SabreTools/ImportExport/ImportTwo.cs
diff --git a/DATabase/MergeDiff.cs b/SabreTools/MergeDiff.cs
similarity index 100%
rename from DATabase/MergeDiff.cs
rename to SabreTools/MergeDiff.cs
diff --git a/DATabase/Partials/SabreTools_Helpers.cs b/SabreTools/Partials/SabreTools_Helpers.cs
similarity index 100%
rename from DATabase/Partials/SabreTools_Helpers.cs
rename to SabreTools/Partials/SabreTools_Helpers.cs
diff --git a/DATabase/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs
similarity index 100%
rename from DATabase/Partials/SabreTools_Inits.cs
rename to SabreTools/Partials/SabreTools_Inits.cs
diff --git a/DATabase/Partials/SabreTools_Menus.cs b/SabreTools/Partials/SabreTools_Menus.cs
similarity index 100%
rename from DATabase/Partials/SabreTools_Menus.cs
rename to SabreTools/Partials/SabreTools_Menus.cs
diff --git a/DATabase/Properties/AssemblyInfo.cs b/SabreTools/Properties/AssemblyInfo.cs
similarity index 100%
rename from DATabase/Properties/AssemblyInfo.cs
rename to SabreTools/Properties/AssemblyInfo.cs
diff --git a/DATabase/SabreTools.cs b/SabreTools/SabreTools.cs
similarity index 100%
rename from DATabase/SabreTools.cs
rename to SabreTools/SabreTools.cs
diff --git a/DATabase/SabreTools.csproj b/SabreTools/SabreTools.csproj
similarity index 99%
rename from DATabase/SabreTools.csproj
rename to SabreTools/SabreTools.csproj
index 9ab5285a..0fcf24af 100644
--- a/DATabase/SabreTools.csproj
+++ b/SabreTools/SabreTools.csproj
@@ -127,7 +127,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SabreHelper\SabreTools.Helper.csproj">
+    <ProjectReference Include="..\SabreTools.Helper\SabreTools.Helper.csproj">
       <Project>{225a1afd-0890-44e8-b779-7502665c23a5}</Project>
       <Name>SabreTools.Helper</Name>
     </ProjectReference>
diff --git a/DATabase/Split.cs b/SabreTools/Split.cs
similarity index 100%
rename from DATabase/Split.cs
rename to SabreTools/Split.cs
diff --git a/DATabase/TrimMerge.cs b/SabreTools/TrimMerge.cs
similarity index 100%
rename from DATabase/TrimMerge.cs
rename to SabreTools/TrimMerge.cs
diff --git a/SabreHelper/packages.config b/SabreTools/packages.config
similarity index 100%
rename from SabreHelper/packages.config
rename to SabreTools/packages.config
diff --git a/SabreToolsUI/SabreToolsUI.csproj b/SabreToolsUI/SabreToolsUI.csproj
index bdb2d13a..54484c01 100644
--- a/SabreToolsUI/SabreToolsUI.csproj
+++ b/SabreToolsUI/SabreToolsUI.csproj
@@ -126,7 +126,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SabreHelper\SabreTools.Helper.csproj">
+    <ProjectReference Include="..\SabreTools.Helper\SabreTools.Helper.csproj">
       <Project>{225a1afd-0890-44e8-b779-7502665c23a5}</Project>
       <Name>SabreTools.Helper</Name>
     </ProjectReference>