diff --git a/SabreTools.Test/Filtering/CleaningTests.cs b/SabreTools.Test/CleaningTests.cs
similarity index 99%
rename from SabreTools.Test/Filtering/CleaningTests.cs
rename to SabreTools.Test/CleaningTests.cs
index dfa5bd6c..61fd1777 100644
--- a/SabreTools.Test/Filtering/CleaningTests.cs
+++ b/SabreTools.Test/CleaningTests.cs
@@ -3,7 +3,7 @@ using SabreTools.DatItems.Formats;
 using SabreTools.DatTools;
 using Xunit;
 
-namespace SabreTools.Test.Filtering
+namespace SabreTools.Test
 {
     public class CleaningTests
     {
diff --git a/SabreTools.Test/DatTools/ParserTests.cs b/SabreTools.Test/ParserTests.cs
similarity index 98%
rename from SabreTools.Test/DatTools/ParserTests.cs
rename to SabreTools.Test/ParserTests.cs
index 1a179f67..baa6ccd5 100644
--- a/SabreTools.Test/DatTools/ParserTests.cs
+++ b/SabreTools.Test/ParserTests.cs
@@ -4,7 +4,7 @@ using SabreTools.DatFiles;
 using SabreTools.DatTools;
 using Xunit;
 
-namespace SabreTools.Test.DatTools
+namespace SabreTools.Test
 {
     public class ParserTests
     {
diff --git a/SabreTools.Test/Filtering/PopulationTests.cs b/SabreTools.Test/PopulationTests.cs
similarity index 98%
rename from SabreTools.Test/Filtering/PopulationTests.cs
rename to SabreTools.Test/PopulationTests.cs
index 7af18920..332f9829 100644
--- a/SabreTools.Test/Filtering/PopulationTests.cs
+++ b/SabreTools.Test/PopulationTests.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using SabreTools.DatTools;
 using Xunit;
 
-namespace SabreTools.Test.Filtering
+namespace SabreTools.Test
 {
     public class PopulationTests
     {
diff --git a/SabreTools.Test/Filtering/RemoverTests.cs b/SabreTools.Test/RemoverTests.cs
similarity index 97%
rename from SabreTools.Test/Filtering/RemoverTests.cs
rename to SabreTools.Test/RemoverTests.cs
index 2abfd3a8..c01fae45 100644
--- a/SabreTools.Test/Filtering/RemoverTests.cs
+++ b/SabreTools.Test/RemoverTests.cs
@@ -1,7 +1,7 @@
 using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
 
-namespace SabreTools.Test.Filtering
+namespace SabreTools.Test
 {
     // TODO: Reenable tests when there's a reasonable way of doing so
     public class RemoverTests
diff --git a/SabreTools.Test/DatTools/ReplacerTests.cs b/SabreTools.Test/ReplacerTests.cs
similarity index 99%
rename from SabreTools.Test/DatTools/ReplacerTests.cs
rename to SabreTools.Test/ReplacerTests.cs
index f3964ffb..7700df5e 100644
--- a/SabreTools.Test/DatTools/ReplacerTests.cs
+++ b/SabreTools.Test/ReplacerTests.cs
@@ -6,7 +6,7 @@ using SabreTools.DatTools;
 using SabreTools.Hashing;
 using Xunit;
 
-namespace SabreTools.Test.DatFiles
+namespace SabreTools.Test
 {
     public class ReplacerTests
     {
diff --git a/SabreTools.Test/DatFiles/SetterTests.cs b/SabreTools.Test/SetterTests.cs
similarity index 97%
rename from SabreTools.Test/DatFiles/SetterTests.cs
rename to SabreTools.Test/SetterTests.cs
index a14b5630..c03a545c 100644
--- a/SabreTools.Test/DatFiles/SetterTests.cs
+++ b/SabreTools.Test/SetterTests.cs
@@ -4,7 +4,7 @@ using SabreTools.DatItems.Formats;
 using SabreTools.DatTools;
 using Xunit;
 
-namespace SabreTools.Test.DatFiles
+namespace SabreTools.Test
 {
     public class SetterTests
     {
diff --git a/SabreTools.Test/DatTools/WriterTests.cs b/SabreTools.Test/WriterTests.cs
similarity index 97%
rename from SabreTools.Test/DatTools/WriterTests.cs
rename to SabreTools.Test/WriterTests.cs
index 53399edb..79d0510b 100644
--- a/SabreTools.Test/DatTools/WriterTests.cs
+++ b/SabreTools.Test/WriterTests.cs
@@ -2,7 +2,7 @@ using SabreTools.DatFiles;
 using SabreTools.DatTools;
 using Xunit;
 
-namespace SabreTools.Test.DatTools
+namespace SabreTools.Test
 {
     public class WriterTests
     {