diff --git a/RombaSharp/Partials/RombaSharp.Helpers.cs b/RombaSharp/Partials/RombaSharp.Helpers.cs
index 635084ed..9c7e8f89 100644
--- a/RombaSharp/Partials/RombaSharp.Helpers.cs
+++ b/RombaSharp/Partials/RombaSharp.Helpers.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Xml;
 using Mono.Data.Sqlite;
 
-using SabreTools.Library;
 using SabreTools.Library.Data;
-using SabreTools.Library.Dats;
+using SabreTools.Library.DatFiles;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/RombaSharp/Partials/RombaSharp.Inits.cs b/RombaSharp/Partials/RombaSharp.Inits.cs
index f82333c6..d3ee2bb9 100644
--- a/RombaSharp/Partials/RombaSharp.Inits.cs
+++ b/RombaSharp/Partials/RombaSharp.Inits.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using Mono.Data.Sqlite;
 
-using SabreTools.Library;
 using SabreTools.Library.Data;
-using SabreTools.Library.Dats;
+using SabreTools.Library.DatFiles;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/RombaSharp/RombaSharp.cs b/RombaSharp/RombaSharp.cs
index 50a0854b..0b5ead96 100644
--- a/RombaSharp/RombaSharp.cs
+++ b/RombaSharp/RombaSharp.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-using SabreTools.Library;
 using SabreTools.Library.Data;
 using SabreTools.Library.Help;
 using SabreTools.Library.Tools;
diff --git a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs b/SabreTools.Library/DatFiles/DatFile.ConvertUpdate.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs
rename to SabreTools.Library/DatFiles/DatFile.ConvertUpdate.cs
index 2f98055b..5796807e 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs
+++ b/SabreTools.Library/DatFiles/DatFile.ConvertUpdate.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
@@ -15,7 +16,7 @@ using SearchOption = System.IO.SearchOption;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.DFD.cs b/SabreTools.Library/DatFiles/DatFile.DFD.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.DFD.cs
rename to SabreTools.Library/DatFiles/DatFile.DFD.cs
index 726eb638..a164a969 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.DFD.cs
+++ b/SabreTools.Library/DatFiles/DatFile.DFD.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
@@ -16,7 +17,7 @@ using SearchOption = System.IO.SearchOption;
 #endif
 using SharpCompress.Common;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs b/SabreTools.Library/DatFiles/DatFile.Manipulate.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
rename to SabreTools.Library/DatFiles/DatFile.Manipulate.cs
index 01fdac75..b3249dfc 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
+++ b/SabreTools.Library/DatFiles/DatFile.Manipulate.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Web;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 
 #if MONO
 using System.IO;
@@ -13,7 +14,7 @@ using System.IO;
 using Alphaleonis.Win32.Filesystem;
 #endif
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs b/SabreTools.Library/DatFiles/DatFile.Parsers.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
rename to SabreTools.Library/DatFiles/DatFile.Parsers.cs
index 266eccf8..ba77c7be 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
+++ b/SabreTools.Library/DatFiles/DatFile.Parsers.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Xml;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
@@ -17,7 +18,7 @@ using Alphaleonis.Win32.Filesystem;
 using StreamReader = System.IO.StreamReader;
 #endif
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Library/DatFiles/DatFile.Rebuild.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
rename to SabreTools.Library/DatFiles/DatFile.Rebuild.cs
index 2151075d..99baf66c 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
+++ b/SabreTools.Library/DatFiles/DatFile.Rebuild.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 using SabreTools.Library.Skippers;
 using SabreTools.Library.Tools;
 
@@ -19,7 +20,7 @@ using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
 #endif
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Splitters.cs b/SabreTools.Library/DatFiles/DatFile.Splitters.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.Splitters.cs
rename to SabreTools.Library/DatFiles/DatFile.Splitters.cs
index 99d622e6..41bfb608 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Splitters.cs
+++ b/SabreTools.Library/DatFiles/DatFile.Splitters.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Web;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
@@ -14,7 +15,7 @@ using Alphaleonis.Win32.Filesystem;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs b/SabreTools.Library/DatFiles/DatFile.Statistics.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.Statistics.cs
rename to SabreTools.Library/DatFiles/DatFile.Statistics.cs
index 55318093..19656351 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs
+++ b/SabreTools.Library/DatFiles/DatFile.Statistics.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Web;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
@@ -16,7 +17,7 @@ using SearchOption = System.IO.SearchOption;
 using StreamWriter = System.IO.StreamWriter;
 #endif
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	/*
 	 * TODO: Make output standard width (HTML, without making the entire thing a table)
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Writers.cs b/SabreTools.Library/DatFiles/DatFile.Writers.cs
similarity index 99%
rename from SabreTools.Library/Dats/Partials/DatFile.Writers.cs
rename to SabreTools.Library/DatFiles/DatFile.Writers.cs
index 95a1e2b3..4b386c1a 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Writers.cs
+++ b/SabreTools.Library/DatFiles/DatFile.Writers.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Web;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 using SabreTools.Library.Tools;
 
 #if MONO
@@ -19,7 +20,7 @@ using StreamWriter = System.IO.StreamWriter;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
similarity index 99%
rename from SabreTools.Library/Dats/DatFile.cs
rename to SabreTools.Library/DatFiles/DatFile.cs
index 5d269757..69b9e83c 100644
--- a/SabreTools.Library/Dats/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/DatHeader.cs b/SabreTools.Library/DatFiles/DatHeader.cs
similarity index 99%
rename from SabreTools.Library/Dats/DatHeader.cs
rename to SabreTools.Library/DatFiles/DatHeader.cs
index 68be417c..948d2f5c 100644
--- a/SabreTools.Library/Dats/DatHeader.cs
+++ b/SabreTools.Library/DatFiles/DatHeader.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public class DatHeader : ICloneable
 	{
diff --git a/SabreTools.Library/Dats/DatStats.cs b/SabreTools.Library/DatFiles/DatStats.cs
similarity index 99%
rename from SabreTools.Library/Dats/DatStats.cs
rename to SabreTools.Library/DatFiles/DatStats.cs
index 7470b122..170c577e 100644
--- a/SabreTools.Library/Dats/DatStats.cs
+++ b/SabreTools.Library/DatFiles/DatStats.cs
@@ -1,8 +1,9 @@
 using System;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public class DatStats
 	{
diff --git a/SabreTools.Library/Dats/Filter.cs b/SabreTools.Library/DatFiles/Filter.cs
similarity index 99%
rename from SabreTools.Library/Dats/Filter.cs
rename to SabreTools.Library/DatFiles/Filter.cs
index 444c13ee..1ff4dae3 100644
--- a/SabreTools.Library/Dats/Filter.cs
+++ b/SabreTools.Library/DatFiles/Filter.cs
@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.Items;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.DatFiles
 {
 	public class Filter
 	{
diff --git a/SabreTools.Library/Data/Globals.cs b/SabreTools.Library/Data/Globals.cs
index 2134549b..0266dcf4 100644
--- a/SabreTools.Library/Data/Globals.cs
+++ b/SabreTools.Library/Data/Globals.cs
@@ -2,6 +2,8 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
+using SabreTools.Library.Tools;
+
 #if MONO
 using System.IO;
 #else
diff --git a/SabreTools.Library/Dats/Archive.cs b/SabreTools.Library/Items/Archive.cs
similarity index 97%
rename from SabreTools.Library/Dats/Archive.cs
rename to SabreTools.Library/Items/Archive.cs
index 9723198d..33c2c8d9 100644
--- a/SabreTools.Library/Dats/Archive.cs
+++ b/SabreTools.Library/Items/Archive.cs
@@ -1,7 +1,7 @@
 using System;
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public class Archive : DatItem
 	{
diff --git a/SabreTools.Library/Dats/BiosSet.cs b/SabreTools.Library/Items/BiosSet.cs
similarity index 98%
rename from SabreTools.Library/Dats/BiosSet.cs
rename to SabreTools.Library/Items/BiosSet.cs
index 28f9ceda..c404f2fb 100644
--- a/SabreTools.Library/Dats/BiosSet.cs
+++ b/SabreTools.Library/Items/BiosSet.cs
@@ -1,7 +1,7 @@
 using System;
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public class BiosSet : DatItem
 	{
diff --git a/SabreTools.Library/Dats/DatItem.cs b/SabreTools.Library/Items/DatItem.cs
similarity index 99%
rename from SabreTools.Library/Dats/DatItem.cs
rename to SabreTools.Library/Items/DatItem.cs
index 4d863b85..1b9d18e3 100644
--- a/SabreTools.Library/Dats/DatItem.cs
+++ b/SabreTools.Library/Items/DatItem.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 using SabreTools.Library.Data;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.Tools;
 
 #if MONO
@@ -12,7 +12,7 @@ using Alphaleonis.Win32.Filesystem;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public abstract class DatItem : IEquatable<DatItem>, IComparable<DatItem>, ICloneable
 	{
diff --git a/SabreTools.Library/Dats/Disk.cs b/SabreTools.Library/Items/Disk.cs
similarity index 99%
rename from SabreTools.Library/Dats/Disk.cs
rename to SabreTools.Library/Items/Disk.cs
index 13bbfd20..34b526d4 100644
--- a/SabreTools.Library/Dats/Disk.cs
+++ b/SabreTools.Library/Items/Disk.cs
@@ -2,7 +2,7 @@
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public class Disk : DatItem
 	{
diff --git a/SabreTools.Library/Dats/Machine.cs b/SabreTools.Library/Items/Machine.cs
similarity index 98%
rename from SabreTools.Library/Dats/Machine.cs
rename to SabreTools.Library/Items/Machine.cs
index 6fb22b65..6a587bb8 100644
--- a/SabreTools.Library/Dats/Machine.cs
+++ b/SabreTools.Library/Items/Machine.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public class Machine : ICloneable
 	{
diff --git a/SabreTools.Library/Dats/Release.cs b/SabreTools.Library/Items/Release.cs
similarity index 98%
rename from SabreTools.Library/Dats/Release.cs
rename to SabreTools.Library/Items/Release.cs
index e1ce9302..38c1aaac 100644
--- a/SabreTools.Library/Dats/Release.cs
+++ b/SabreTools.Library/Items/Release.cs
@@ -2,7 +2,7 @@
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public class Release : DatItem
 	{
diff --git a/SabreTools.Library/Dats/Rom.cs b/SabreTools.Library/Items/Rom.cs
similarity index 99%
rename from SabreTools.Library/Dats/Rom.cs
rename to SabreTools.Library/Items/Rom.cs
index e6bed00a..dfd3582a 100644
--- a/SabreTools.Library/Dats/Rom.cs
+++ b/SabreTools.Library/Items/Rom.cs
@@ -2,7 +2,7 @@
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public class Rom : Disk, ICloneable
 	{
diff --git a/SabreTools.Library/Dats/Sample.cs b/SabreTools.Library/Items/Sample.cs
similarity index 97%
rename from SabreTools.Library/Dats/Sample.cs
rename to SabreTools.Library/Items/Sample.cs
index 5d5012e2..d8d990b6 100644
--- a/SabreTools.Library/Dats/Sample.cs
+++ b/SabreTools.Library/Items/Sample.cs
@@ -2,7 +2,7 @@
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Dats
+namespace SabreTools.Library.Items
 {
 	public class Sample : DatItem
 	{
diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.Library/SabreTools.Library.csproj
index bdf0e2bf..a81aa951 100644
--- a/SabreTools.Library/SabreTools.Library.csproj
+++ b/SabreTools.Library/SabreTools.Library.csproj
@@ -115,17 +115,17 @@
     <Compile Include="Data\Constants.cs" />
     <Compile Include="Data\Flags.cs" />
     <Compile Include="Data\Globals.cs" />
-    <Compile Include="Dats\DatHeader.cs" />
-    <Compile Include="Dats\DatStats.cs" />
-    <Compile Include="Dats\Partials\DatFile.Manipulate.cs" />
-    <Compile Include="Dats\Partials\DatFile.ConvertUpdate.cs" />
-    <Compile Include="Dats\Partials\DatFile.DFD.cs" />
-    <Compile Include="Dats\Partials\DatFile.Parsers.cs" />
-    <Compile Include="Dats\Filter.cs" />
-    <Compile Include="Dats\Partials\DatFile.Rebuild.cs" />
-    <Compile Include="Dats\Partials\DatFile.Splitters.cs" />
-    <Compile Include="Dats\Partials\DatFile.Statistics.cs" />
-    <Compile Include="Dats\Partials\DatFile.Writers.cs" />
+    <Compile Include="DatFiles\DatHeader.cs" />
+    <Compile Include="DatFiles\DatStats.cs" />
+    <Compile Include="DatFiles\DatFile.Manipulate.cs" />
+    <Compile Include="DatFiles\DatFile.ConvertUpdate.cs" />
+    <Compile Include="DatFiles\DatFile.DFD.cs" />
+    <Compile Include="DatFiles\DatFile.Parsers.cs" />
+    <Compile Include="DatFiles\Filter.cs" />
+    <Compile Include="DatFiles\DatFile.Rebuild.cs" />
+    <Compile Include="DatFiles\DatFile.Splitters.cs" />
+    <Compile Include="DatFiles\DatFile.Statistics.cs" />
+    <Compile Include="DatFiles\DatFile.Writers.cs" />
     <Compile Include="External\CoreRarArchive.cs" />
     <Compile Include="External\NaturalSort\NaturalComparer.cs" />
     <Compile Include="External\NaturalSort\NaturalReversedComparer.cs" />
@@ -145,27 +145,27 @@
     <Compile Include="External\Zlib\ZlibCodec.cs" />
     <Compile Include="External\Zlib\ZlibConstants.cs" />
     <Compile Include="External\Zlib\ZlibStream.cs" />
-    <Compile Include="Dats\Archive.cs" />
-    <Compile Include="Dats\BiosSet.cs" />
-    <Compile Include="Dats\DatFile.cs" />
-    <Compile Include="Dats\DatItem.cs" />
-    <Compile Include="Dats\Disk.cs" />
-    <Compile Include="Dats\Machine.cs" />
-    <Compile Include="Dats\Release.cs" />
-    <Compile Include="Dats\Sample.cs" />
-    <Compile Include="Dats\Rom.cs" />
+    <Compile Include="Items\Archive.cs" />
+    <Compile Include="Items\BiosSet.cs" />
+    <Compile Include="DatFiles\DatFile.cs" />
+    <Compile Include="Items\DatItem.cs" />
+    <Compile Include="Items\Disk.cs" />
+    <Compile Include="Items\Machine.cs" />
+    <Compile Include="Items\Release.cs" />
+    <Compile Include="Items\Sample.cs" />
+    <Compile Include="Items\Rom.cs" />
     <Compile Include="External\SupportedFiles\ZipFileEntry.cs" />
     <Compile Include="External\SupportedFiles\ZipFile.cs" />
     <Compile Include="Help\Feature.cs" />
     <Compile Include="Help\Help.cs" />
     <Compile Include="Skippers\Skipper.cs" />
     <Compile Include="Skippers\SkipperRule.cs" />
-    <Compile Include="InternalStopwatch.cs" />
+    <Compile Include="Tools\InternalStopwatch.cs" />
     <Compile Include="Tools\ArchiveTools.cs" />
     <Compile Include="Tools\FileTools.cs" />
     <Compile Include="Tools\DatabaseTools.cs" />
     <Compile Include="Data\Enums.cs" />
-    <Compile Include="Logger.cs" />
+    <Compile Include="Tools\Logger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tools\Style.cs" />
     <Compile Include="Data\Build.cs" />
@@ -203,7 +203,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Dats\Partials\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets" Condition="Exists('..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets')" />
   <Target Name="EnsureMonoDataSqlitePortableImported" BeforeTargets="BeforeBuild" Condition="'$(MonoDataSqlitePortableImported)' == ''">
diff --git a/SabreTools.Library/Tools/ArchiveTools.cs b/SabreTools.Library/Tools/ArchiveTools.cs
index fde0a4f7..49f3d2cd 100644
--- a/SabreTools.Library/Tools/ArchiveTools.cs
+++ b/SabreTools.Library/Tools/ArchiveTools.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Dats;
+using SabreTools.Library.Items;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools.Library/Tools/FileTools.cs b/SabreTools.Library/Tools/FileTools.cs
index d8f17096..6ac12cce 100644
--- a/SabreTools.Library/Tools/FileTools.cs
+++ b/SabreTools.Library/Tools/FileTools.cs
@@ -6,8 +6,8 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Dats;
 using SabreTools.Library.External;
+using SabreTools.Library.Items;
 using SabreTools.Library.Skippers;
 
 #if MONO
diff --git a/SabreTools.Library/InternalStopwatch.cs b/SabreTools.Library/Tools/InternalStopwatch.cs
similarity index 98%
rename from SabreTools.Library/InternalStopwatch.cs
rename to SabreTools.Library/Tools/InternalStopwatch.cs
index 3db78229..fceead39 100644
--- a/SabreTools.Library/InternalStopwatch.cs
+++ b/SabreTools.Library/Tools/InternalStopwatch.cs
@@ -2,7 +2,7 @@
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library
+namespace SabreTools.Library.Tools
 {
 	/// <summary>
 	/// Stopwatch class for keeping track of duration in the code
diff --git a/SabreTools.Library/Logger.cs b/SabreTools.Library/Tools/Logger.cs
similarity index 99%
rename from SabreTools.Library/Logger.cs
rename to SabreTools.Library/Tools/Logger.cs
index c328dfa2..f270d72b 100644
--- a/SabreTools.Library/Logger.cs
+++ b/SabreTools.Library/Tools/Logger.cs
@@ -13,7 +13,7 @@ using FileStream = System.IO.FileStream;
 using StreamWriter = System.IO.StreamWriter;
 #endif
 
-namespace SabreTools.Library
+namespace SabreTools.Library.Tools
 {
 	/// <summary>
 	/// Log either to file or to the console
diff --git a/SabreTools.Library/Tools/Style.cs b/SabreTools.Library/Tools/Style.cs
index 7b633113..e32d2491 100644
--- a/SabreTools.Library/Tools/Style.cs
+++ b/SabreTools.Library/Tools/Style.cs
@@ -7,7 +7,7 @@ using System.Text.RegularExpressions;
 using System.Web;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Dats;
+using SabreTools.Library.DatFiles;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools/Partials/SabreTools.Inits.cs b/SabreTools/Partials/SabreTools.Inits.cs
index 055cf48c..a354807c 100644
--- a/SabreTools/Partials/SabreTools.Inits.cs
+++ b/SabreTools/Partials/SabreTools.Inits.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
-using SabreTools.Library;
 using SabreTools.Library.Data;
-using SabreTools.Library.Dats;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index 61dca705..17b5f12e 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using SabreTools.Library;
 using SabreTools.Library.Data;
-using SabreTools.Library.Dats;
+using SabreTools.Library.DatFiles;
 using SabreTools.Library.Help;
 using SabreTools.Library.Tools;