diff --git a/SabreTools.DatFiles/Formats/AttractMode.cs b/SabreTools.DatFiles/Formats/AttractMode.cs
index 13ee8cfd..17f60a77 100644
--- a/SabreTools.DatFiles/Formats/AttractMode.cs
+++ b/SabreTools.DatFiles/Formats/AttractMode.cs
@@ -6,6 +6,8 @@ using System.Text;
 using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
+using SabreTools.IO.Readers;
+using SabreTools.IO.Writers;
 
 namespace SabreTools.DatFiles.Formats
 {
diff --git a/SabreTools.DatFiles/Formats/ClrMamePro.cs b/SabreTools.DatFiles/Formats/ClrMamePro.cs
index 36405945..382ba735 100644
--- a/SabreTools.DatFiles/Formats/ClrMamePro.cs
+++ b/SabreTools.DatFiles/Formats/ClrMamePro.cs
@@ -7,6 +7,8 @@ using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
+using SabreTools.IO.Readers;
+using SabreTools.IO.Writers;
 
 namespace SabreTools.DatFiles.Formats
 {
diff --git a/SabreTools.DatFiles/Formats/DosCenter.cs b/SabreTools.DatFiles/Formats/DosCenter.cs
index 606e808c..c840c89d 100644
--- a/SabreTools.DatFiles/Formats/DosCenter.cs
+++ b/SabreTools.DatFiles/Formats/DosCenter.cs
@@ -8,6 +8,8 @@ using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
+using SabreTools.IO.Readers;
+using SabreTools.IO.Writers;
 
 namespace SabreTools.DatFiles.Formats
 {
diff --git a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
index d4dda99c..2e2b1bd6 100644
--- a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
+++ b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
@@ -6,6 +6,8 @@ using System.Text;
 using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
+using SabreTools.IO.Readers;
+using SabreTools.IO.Writers;
 
 namespace SabreTools.DatFiles.Formats
 {
diff --git a/SabreTools.DatFiles/Formats/Hashfile.cs b/SabreTools.DatFiles/Formats/Hashfile.cs
index 82f2bf85..9e437a79 100644
--- a/SabreTools.DatFiles/Formats/Hashfile.cs
+++ b/SabreTools.DatFiles/Formats/Hashfile.cs
@@ -6,6 +6,7 @@ using System.Text;
 using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
+using SabreTools.IO.Writers;
 
 namespace SabreTools.DatFiles.Formats
 {
diff --git a/SabreTools.DatFiles/Formats/RomCenter.cs b/SabreTools.DatFiles/Formats/RomCenter.cs
index cfe655ac..d9c960ba 100644
--- a/SabreTools.DatFiles/Formats/RomCenter.cs
+++ b/SabreTools.DatFiles/Formats/RomCenter.cs
@@ -6,7 +6,8 @@ using System.Text;
 using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
-using SabreTools.IO;
+using SabreTools.IO.Readers;
+using SabreTools.IO.Writers;
 
 namespace SabreTools.DatFiles.Formats
 {
diff --git a/SabreTools.DatFiles/Formats/SeparatedValue.cs b/SabreTools.DatFiles/Formats/SeparatedValue.cs
index e5571513..e651906e 100644
--- a/SabreTools.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.DatFiles/Formats/SeparatedValue.cs
@@ -7,6 +7,8 @@ using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
+using SabreTools.IO.Readers;
+using SabreTools.IO.Writers;
 
 namespace SabreTools.DatFiles.Formats
 {
diff --git a/SabreTools.Filtering/ExtraIniItem.cs b/SabreTools.Filtering/ExtraIniItem.cs
index e3578e86..ab673180 100644
--- a/SabreTools.Filtering/ExtraIniItem.cs
+++ b/SabreTools.Filtering/ExtraIniItem.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Core;
-using SabreTools.IO;
+using SabreTools.IO.Readers;
 using SabreTools.Logging;
 
 namespace SabreTools.Filtering
diff --git a/SabreTools.IO/ClrMameProReader.cs b/SabreTools.IO/Readers/ClrMameProReader.cs
similarity index 99%
rename from SabreTools.IO/ClrMameProReader.cs
rename to SabreTools.IO/Readers/ClrMameProReader.cs
index d63f9d9d..d4aa4196 100644
--- a/SabreTools.IO/ClrMameProReader.cs
+++ b/SabreTools.IO/Readers/ClrMameProReader.cs
@@ -5,9 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
-using SabreTools.Core;
-
-namespace SabreTools.IO
+namespace SabreTools.IO.Readers
 {
     public class ClrMameProReader : IDisposable
     {
diff --git a/SabreTools.IO/Enums.cs b/SabreTools.IO/Readers/Enums.cs
similarity index 92%
rename from SabreTools.IO/Enums.cs
rename to SabreTools.IO/Readers/Enums.cs
index 0874c636..877f09fe 100644
--- a/SabreTools.IO/Enums.cs
+++ b/SabreTools.IO/Readers/Enums.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.IO
+namespace SabreTools.IO.Readers
 {
     /// <summary>
     /// Different types of CMP rows being parsed
diff --git a/SabreTools.IO/IniReader.cs b/SabreTools.IO/Readers/IniReader.cs
similarity index 99%
rename from SabreTools.IO/IniReader.cs
rename to SabreTools.IO/Readers/IniReader.cs
index b30a5a0b..b1d5632a 100644
--- a/SabreTools.IO/IniReader.cs
+++ b/SabreTools.IO/Readers/IniReader.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-namespace SabreTools.IO
+namespace SabreTools.IO.Readers
 {
     public class IniReader : IDisposable
     {
diff --git a/SabreTools.IO/SeparatedValueReader.cs b/SabreTools.IO/Readers/SeparatedValueReader.cs
similarity index 99%
rename from SabreTools.IO/SeparatedValueReader.cs
rename to SabreTools.IO/Readers/SeparatedValueReader.cs
index bc4ca93e..2f2938c3 100644
--- a/SabreTools.IO/SeparatedValueReader.cs
+++ b/SabreTools.IO/Readers/SeparatedValueReader.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace SabreTools.IO
+namespace SabreTools.IO.Readers
 {
     public class SeparatedValueReader : IDisposable
     {
diff --git a/SabreTools.IO/StreamExtensions.cs b/SabreTools.IO/StreamExtensions.cs
index 985003f3..f0456efc 100644
--- a/SabreTools.IO/StreamExtensions.cs
+++ b/SabreTools.IO/StreamExtensions.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Linq;
 
 namespace SabreTools.IO
 {
diff --git a/SabreTools.IO/ClrMameProWriter.cs b/SabreTools.IO/Writers/ClrMameProWriter.cs
similarity index 99%
rename from SabreTools.IO/ClrMameProWriter.cs
rename to SabreTools.IO/Writers/ClrMameProWriter.cs
index 57752f4b..980dc696 100644
--- a/SabreTools.IO/ClrMameProWriter.cs
+++ b/SabreTools.IO/Writers/ClrMameProWriter.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace SabreTools.IO
+namespace SabreTools.IO.Writers
 {
     /// <summary>
     /// ClrMamePro writer patterned heavily off of XmlTextWriter
diff --git a/SabreTools.IO/IniWriter.cs b/SabreTools.IO/Writers/IniWriter.cs
similarity index 98%
rename from SabreTools.IO/IniWriter.cs
rename to SabreTools.IO/Writers/IniWriter.cs
index dfc92e1d..9da83978 100644
--- a/SabreTools.IO/IniWriter.cs
+++ b/SabreTools.IO/Writers/IniWriter.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace SabreTools.IO
+namespace SabreTools.IO.Writers
 {
     public class IniWriter : IDisposable
     {
diff --git a/SabreTools.IO/SeparatedValueWriter.cs b/SabreTools.IO/Writers/SeparatedValueWriter.cs
similarity index 99%
rename from SabreTools.IO/SeparatedValueWriter.cs
rename to SabreTools.IO/Writers/SeparatedValueWriter.cs
index 3c57b2ca..c69832f7 100644
--- a/SabreTools.IO/SeparatedValueWriter.cs
+++ b/SabreTools.IO/Writers/SeparatedValueWriter.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace SabreTools.IO
+namespace SabreTools.IO.Writers
 {
     public class SeparatedValueWriter : IDisposable
     {