diff --git a/SabreTools.RedumpLib.Test/FormatterTests.cs b/SabreTools.RedumpLib.Test/RedumpOrg/FormatterTests.cs
similarity index 99%
rename from SabreTools.RedumpLib.Test/FormatterTests.cs
rename to SabreTools.RedumpLib.Test/RedumpOrg/FormatterTests.cs
index cd489e8..71a4d3e 100644
--- a/SabreTools.RedumpLib.Test/FormatterTests.cs
+++ b/SabreTools.RedumpLib.Test/RedumpOrg/FormatterTests.cs
@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Data.Sections;
+using SabreTools.RedumpLib.RedumpOrg;
 using SabreTools.RedumpLib.RedumpOrg.Data;
 using Xunit;
 
-namespace SabreTools.RedumpLib.Test
+namespace SabreTools.RedumpLib.Test.RedumpOrg
 {
     public class FormatterTests
     {
diff --git a/SabreTools.RedumpLib/Formatter.cs b/SabreTools.RedumpLib/RedumpOrg/Formatter.cs
similarity index 99%
rename from SabreTools.RedumpLib/Formatter.cs
rename to SabreTools.RedumpLib/RedumpOrg/Formatter.cs
index 703a3f2..bb08d78 100644
--- a/SabreTools.RedumpLib/Formatter.cs
+++ b/SabreTools.RedumpLib/RedumpOrg/Formatter.cs
@@ -6,7 +6,7 @@ using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Data.Sections;
 using SabreTools.RedumpLib.RedumpOrg.Data;
 
-namespace SabreTools.RedumpLib
+namespace SabreTools.RedumpLib.RedumpOrg
 {
     public static class Formatter
     {
@@ -278,7 +278,7 @@ namespace SabreTools.RedumpLib
             bool reverseOrder = system.HasReversedRingcodes();
 
             // Extract the size from the hashes
-            long size = Data.Extensions.ExtractSizeFromHashData(tawo?.ClrMameProData);
+            long size = RedumpLib.Data.Extensions.ExtractSizeFromHashData(tawo?.ClrMameProData);
 
             output.AppendLine("Common Disc Info:");