diff --git a/NaturalComparer.cs b/Compare/NaturalComparer.cs
similarity index 98%
rename from NaturalComparer.cs
rename to Compare/NaturalComparer.cs
index eff784f..a2e815f 100644
--- a/NaturalComparer.cs
+++ b/Compare/NaturalComparer.cs
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Compare
 {
     public class NaturalComparer : Comparer<string>, IDisposable
     {
diff --git a/NaturalComparerUtil.cs b/Compare/NaturalComparerUtil.cs
similarity index 98%
rename from NaturalComparerUtil.cs
rename to Compare/NaturalComparerUtil.cs
index 90779bc..b907b23 100644
--- a/NaturalComparerUtil.cs
+++ b/Compare/NaturalComparerUtil.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Compare
 {
     public static class NaturalComparerUtil
     {
diff --git a/NaturalReversedComparer.cs b/Compare/NaturalReversedComparer.cs
similarity index 98%
rename from NaturalReversedComparer.cs
rename to Compare/NaturalReversedComparer.cs
index 63febbb..0fe2698 100644
--- a/NaturalReversedComparer.cs
+++ b/Compare/NaturalReversedComparer.cs
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Compare
 {
     public class NaturalReversedComparer : Comparer<string>, IDisposable
     {
diff --git a/ContentMatch.cs b/Content/ContentMatch.cs
similarity index 99%
rename from ContentMatch.cs
rename to Content/ContentMatch.cs
index a8607d1..a0cb750 100644
--- a/ContentMatch.cs
+++ b/Content/ContentMatch.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Content
 {
     /// <summary>
     /// Content matching criteria
diff --git a/ContentMatchSet.cs b/Content/ContentMatchSet.cs
similarity index 99%
rename from ContentMatchSet.cs
rename to Content/ContentMatchSet.cs
index f888b5d..bf656ef 100644
--- a/ContentMatchSet.cs
+++ b/Content/ContentMatchSet.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Content
 {
     /// <summary>
     /// A set of content matches that work together
diff --git a/Extensions.cs b/Extensions.cs
index b3f4900..c7eae8a 100644
--- a/Extensions.cs
+++ b/Extensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Matching.Content;
 
 namespace SabreTools.Matching
 {
diff --git a/MatchUtil.cs b/MatchUtil.cs
index 404a8e2..ade7100 100644
--- a/MatchUtil.cs
+++ b/MatchUtil.cs
@@ -4,6 +4,8 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 
 namespace SabreTools.Matching
 {
diff --git a/FilePathMatch.cs b/Paths/FilePathMatch.cs
similarity index 91%
rename from FilePathMatch.cs
rename to Paths/FilePathMatch.cs
index dc4afaf..5bc4010 100644
--- a/FilePathMatch.cs
+++ b/Paths/FilePathMatch.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Paths
 {
     /// <summary>
     /// File path matching criteria
diff --git a/PathMatch.cs b/Paths/PathMatch.cs
similarity index 98%
rename from PathMatch.cs
rename to Paths/PathMatch.cs
index 87070cc..829099f 100644
--- a/PathMatch.cs
+++ b/Paths/PathMatch.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Paths
 {
     /// <summary>
     /// Path matching criteria
diff --git a/PathMatchSet.cs b/Paths/PathMatchSet.cs
similarity index 99%
rename from PathMatchSet.cs
rename to Paths/PathMatchSet.cs
index 593ab5f..5a8ac0f 100644
--- a/PathMatchSet.cs
+++ b/Paths/PathMatchSet.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SabreTools.Matching
+namespace SabreTools.Matching.Paths
 {
     /// <summary>
     /// A set of path matches that work together