diff --git a/SabreTools.Core/Filter/FieldManipulator.cs b/SabreTools.Core/Filter/FieldManipulator.cs
index 04f53ab2..52ac3a33 100644
--- a/SabreTools.Core/Filter/FieldManipulator.cs
+++ b/SabreTools.Core/Filter/FieldManipulator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
+using SabreTools.Core.Tools;
 using SabreTools.Models.Metadata;
 
 namespace SabreTools.Core.Filter
diff --git a/SabreTools.Core/Filter/FilterParser.cs b/SabreTools.Core/Filter/FilterParser.cs
index 36dcc95c..b28b4884 100644
--- a/SabreTools.Core/Filter/FilterParser.cs
+++ b/SabreTools.Core/Filter/FilterParser.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using SabreTools.Core.Tools;
 using SabreTools.Models.Metadata;
 
 namespace SabreTools.Core.Filter
diff --git a/SabreTools.Core/Filter/FilterRunner.cs b/SabreTools.Core/Filter/FilterRunner.cs
index 76b6776c..751a5411 100644
--- a/SabreTools.Core/Filter/FilterRunner.cs
+++ b/SabreTools.Core/Filter/FilterRunner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Core.Tools;
 using SabreTools.Models.Metadata;
 
 namespace SabreTools.Core.Filter
diff --git a/SabreTools.Core/Filter/TypeHelper.cs b/SabreTools.Core/Tools/TypeHelper.cs
similarity index 98%
rename from SabreTools.Core/Filter/TypeHelper.cs
rename to SabreTools.Core/Tools/TypeHelper.cs
index 79a282c0..e242d0a8 100644
--- a/SabreTools.Core/Filter/TypeHelper.cs
+++ b/SabreTools.Core/Tools/TypeHelper.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 using SabreTools.Models;
 using SabreTools.Models.Metadata;
 
-namespace SabreTools.Core.Filter
+namespace SabreTools.Core.Tools
 {
     public static class TypeHelper
     {
diff --git a/SabreTools.DatItems/Machine.cs b/SabreTools.DatItems/Machine.cs
index e6d63e37..304e2f64 100644
--- a/SabreTools.DatItems/Machine.cs
+++ b/SabreTools.DatItems/Machine.cs
@@ -3,6 +3,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Core;
 using SabreTools.Core.Filter;
+using SabreTools.Core.Tools;
 
 namespace SabreTools.DatItems
 {