diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs
index 1146dc3b..2a227d34 100644
--- a/SabreTools.Library/DatFiles/AttractMode.cs
+++ b/SabreTools.Library/DatFiles/AttractMode.cs
@@ -6,6 +6,7 @@ using System.Text;
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
+using SabreTools.Library.Writers;
 using NaturalSort;
 
 namespace SabreTools.Library.DatFiles
diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.Library/DatFiles/ClrMamePro.cs
index 84ffe960..994bdb55 100644
--- a/SabreTools.Library/DatFiles/ClrMamePro.cs
+++ b/SabreTools.Library/DatFiles/ClrMamePro.cs
@@ -7,6 +7,7 @@ using System.Text.RegularExpressions;
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
+using SabreTools.Library.Writers;
 using NaturalSort;
 
 namespace SabreTools.Library.DatFiles
diff --git a/SabreTools.Library/DatFiles/DosCenter.cs b/SabreTools.Library/DatFiles/DosCenter.cs
index 8aa093f2..a7fc3c24 100644
--- a/SabreTools.Library/DatFiles/DosCenter.cs
+++ b/SabreTools.Library/DatFiles/DosCenter.cs
@@ -8,6 +8,7 @@ using System.Text.RegularExpressions;
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
+using SabreTools.Library.Writers;
 using NaturalSort;
 
 namespace SabreTools.Library.DatFiles
diff --git a/SabreTools.Library/DatFiles/EverdriveSmdb.cs b/SabreTools.Library/DatFiles/EverdriveSmdb.cs
index 30d71761..7c19234f 100644
--- a/SabreTools.Library/DatFiles/EverdriveSmdb.cs
+++ b/SabreTools.Library/DatFiles/EverdriveSmdb.cs
@@ -6,6 +6,7 @@ using System.Text;
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
+using SabreTools.Library.Writers;
 using NaturalSort;
 
 namespace SabreTools.Library.DatFiles
diff --git a/SabreTools.Library/DatFiles/Hashfile.cs b/SabreTools.Library/DatFiles/Hashfile.cs
index 9acd1197..7478effa 100644
--- a/SabreTools.Library/DatFiles/Hashfile.cs
+++ b/SabreTools.Library/DatFiles/Hashfile.cs
@@ -6,6 +6,7 @@ using System.Text;
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
+using SabreTools.Library.Writers;
 using NaturalSort;
 
 namespace SabreTools.Library.DatFiles
diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs
index a83df200..3ad88bfc 100644
--- a/SabreTools.Library/DatFiles/SeparatedValue.cs
+++ b/SabreTools.Library/DatFiles/SeparatedValue.cs
@@ -6,6 +6,7 @@ using System.Text;
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
+using SabreTools.Library.Writers;
 using NaturalSort;
 
 namespace SabreTools.Library.DatFiles
diff --git a/SabreTools.Library/Tools/ClrMameProWriter.cs b/SabreTools.Library/Writers/ClrMameProWriter.cs
similarity index 99%
rename from SabreTools.Library/Tools/ClrMameProWriter.cs
rename to SabreTools.Library/Writers/ClrMameProWriter.cs
index c2f55f88..1f8f5cab 100644
--- a/SabreTools.Library/Tools/ClrMameProWriter.cs
+++ b/SabreTools.Library/Writers/ClrMameProWriter.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace SabreTools.Library.Tools
+namespace SabreTools.Library.Writers
 {
     /// <summary>
     /// ClrMamePro writer patterned heavily off of XmlTextWriter
diff --git a/SabreTools.Library/Tools/SeparatedValueWriter.cs b/SabreTools.Library/Writers/SeparatedValueWriter.cs
similarity index 99%
rename from SabreTools.Library/Tools/SeparatedValueWriter.cs
rename to SabreTools.Library/Writers/SeparatedValueWriter.cs
index 760cb475..fabe32f0 100644
--- a/SabreTools.Library/Tools/SeparatedValueWriter.cs
+++ b/SabreTools.Library/Writers/SeparatedValueWriter.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace SabreTools.Library.Tools
+namespace SabreTools.Library.Writers
 {
     public class SeparatedValueWriter : IDisposable
     {