From ce2ddf16367fcb8f01e5d83c0680fb0ffa7d3e51 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 26 Mar 2026 11:27:29 -0400
Subject: [PATCH] Simplify SabreTools.Metadata base namespace

---
 SabreTools.Metadata.DatFiles.Test/ConvertersTests.cs    | 1 -
 SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs      | 1 -
 SabreTools.Metadata.DatFiles/DatFile.cs                 | 1 -
 SabreTools.Metadata.DatFiles/DatHeader.cs               | 1 -
 SabreTools.Metadata.DatFiles/Extensions.cs              | 1 -
 SabreTools.Metadata.DatItems.Test/ConvertersTests.cs    | 1 -
 SabreTools.Metadata.DatItems/Extensions.cs              | 1 -
 SabreTools.Metadata.DatItems/Formats/Adjuster.cs        | 1 -
 SabreTools.Metadata.DatItems/Formats/BiosSet.cs         | 1 -
 SabreTools.Metadata.DatItems/Formats/Chip.cs            | 1 -
 SabreTools.Metadata.DatItems/Formats/ConfLocation.cs    | 1 -
 SabreTools.Metadata.DatItems/Formats/ConfSetting.cs     | 1 -
 SabreTools.Metadata.DatItems/Formats/Control.cs         | 1 -
 SabreTools.Metadata.DatItems/Formats/Device.cs          | 1 -
 SabreTools.Metadata.DatItems/Formats/DipLocation.cs     | 1 -
 SabreTools.Metadata.DatItems/Formats/DipSwitch.cs       | 1 -
 SabreTools.Metadata.DatItems/Formats/DipValue.cs        | 1 -
 SabreTools.Metadata.DatItems/Formats/Disk.cs            | 1 -
 SabreTools.Metadata.DatItems/Formats/Display.cs         | 1 -
 SabreTools.Metadata.DatItems/Formats/Driver.cs          | 1 -
 SabreTools.Metadata.DatItems/Formats/Input.cs           | 1 -
 SabreTools.Metadata.DatItems/Formats/RamOption.cs       | 1 -
 SabreTools.Metadata.DatItems/Formats/Release.cs         | 1 -
 SabreTools.Metadata.DatItems/Formats/Rom.cs             | 1 -
 SabreTools.Metadata.DatItems/Formats/SlotOption.cs      | 1 -
 SabreTools.Metadata.DatItems/Machine.cs                 | 1 -
 SabreTools.Metadata.DatItems/Trurip.cs                  | 1 -
 SabreTools.Metadata.Filter/FilterKey.cs                 | 1 -
 SabreTools.Metadata.Filter/FilterObject.cs              | 1 -
 SabreTools.Metadata.Filter/FilterRunner.cs              | 1 -
 SabreTools.Metadata.Test/{Tools => }/ConvertersTests.cs | 2 +-
 SabreTools.Metadata.Test/{Tools => }/UtilitiesTests.cs  | 2 +-
 SabreTools.Metadata/{Tools => }/AttributeHelper.cs      | 2 +-
 SabreTools.Metadata/{Tools => }/Converters.cs           | 2 +-
 SabreTools.Metadata/ModelBackedItemT.cs                 | 1 -
 SabreTools.Metadata/{Tools => }/TypeHelper.cs           | 2 +-
 SabreTools.Metadata/{Tools => }/Utilities.cs            | 2 +-
 37 files changed, 6 insertions(+), 37 deletions(-)
 rename SabreTools.Metadata.Test/{Tools => }/ConvertersTests.cs (95%)
 rename SabreTools.Metadata.Test/{Tools => }/UtilitiesTests.cs (98%)
 rename SabreTools.Metadata/{Tools => }/AttributeHelper.cs (97%)
 rename SabreTools.Metadata/{Tools => }/Converters.cs (99%)
 rename SabreTools.Metadata/{Tools => }/TypeHelper.cs (99%)
 rename SabreTools.Metadata/{Tools => }/Utilities.cs (98%)

diff --git a/SabreTools.Metadata.DatFiles.Test/ConvertersTests.cs b/SabreTools.Metadata.DatFiles.Test/ConvertersTests.cs
index 95827ede..a7603026 100644
--- a/SabreTools.Metadata.DatFiles.Test/ConvertersTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/ConvertersTests.cs
@@ -1,4 +1,3 @@
-using SabreTools.Metadata.Tools;
 using Xunit;
 
 namespace SabreTools.Metadata.DatFiles.Test
diff --git a/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs b/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs
index 5fe62d48..c0f6c1e7 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Metadata.DatItems;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatFiles
 {
diff --git a/SabreTools.Metadata.DatFiles/DatFile.cs b/SabreTools.Metadata.DatFiles/DatFile.cs
index 8916f310..66847431 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.cs
@@ -8,7 +8,6 @@ using SabreTools.Logging;
 using SabreTools.Metadata.DatItems;
 using SabreTools.Metadata.DatItems.Formats;
 using SabreTools.Metadata.Filter;
-using SabreTools.Metadata.Tools;
 using SabreTools.Text.Compare;
 using SabreTools.Text.Extensions;
 
diff --git a/SabreTools.Metadata.DatFiles/DatHeader.cs b/SabreTools.Metadata.DatFiles/DatHeader.cs
index ef7921bd..330918d5 100644
--- a/SabreTools.Metadata.DatFiles/DatHeader.cs
+++ b/SabreTools.Metadata.DatFiles/DatHeader.cs
@@ -2,7 +2,6 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Metadata.Filter;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatFiles
 {
diff --git a/SabreTools.Metadata.DatFiles/Extensions.cs b/SabreTools.Metadata.DatFiles/Extensions.cs
index 986af2b4..dfb4e6a2 100644
--- a/SabreTools.Metadata.DatFiles/Extensions.cs
+++ b/SabreTools.Metadata.DatFiles/Extensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatFiles
 {
diff --git a/SabreTools.Metadata.DatItems.Test/ConvertersTests.cs b/SabreTools.Metadata.DatItems.Test/ConvertersTests.cs
index 465eb986..9b9a0a2e 100644
--- a/SabreTools.Metadata.DatItems.Test/ConvertersTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/ConvertersTests.cs
@@ -1,4 +1,3 @@
-using SabreTools.Metadata.Tools;
 using Xunit;
 
 namespace SabreTools.Metadata.DatItems.Test
diff --git a/SabreTools.Metadata.DatItems/Extensions.cs b/SabreTools.Metadata.DatItems/Extensions.cs
index c522ff7a..ba94939b 100644
--- a/SabreTools.Metadata.DatItems/Extensions.cs
+++ b/SabreTools.Metadata.DatItems/Extensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Adjuster.cs b/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
index 0706bbc8..b41bdf91 100644
--- a/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/BiosSet.cs b/SabreTools.Metadata.DatItems/Formats/BiosSet.cs
index 8462abe6..740fa16d 100644
--- a/SabreTools.Metadata.DatItems/Formats/BiosSet.cs
+++ b/SabreTools.Metadata.DatItems/Formats/BiosSet.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Chip.cs b/SabreTools.Metadata.DatItems/Formats/Chip.cs
index 127a9239..3b2bb106 100644
--- a/SabreTools.Metadata.DatItems/Formats/Chip.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Chip.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs b/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
index 7e9fe37f..35c895f1 100644
--- a/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
index 26d4b6f4..485e8e60 100644
--- a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Control.cs b/SabreTools.Metadata.DatItems/Formats/Control.cs
index f530d328..7177df7e 100644
--- a/SabreTools.Metadata.DatItems/Formats/Control.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Control.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Device.cs b/SabreTools.Metadata.DatItems/Formats/Device.cs
index cfdb825c..0fbecdc9 100644
--- a/SabreTools.Metadata.DatItems/Formats/Device.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Device.cs
@@ -2,7 +2,6 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Data.Extensions;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/DipLocation.cs b/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
index 6bf2b730..b1158abe 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
index 0dfdcf5c..5686713d 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
@@ -2,7 +2,6 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Data.Extensions;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/DipValue.cs b/SabreTools.Metadata.DatItems/Formats/DipValue.cs
index 1969f8d9..82461507 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipValue.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipValue.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Disk.cs b/SabreTools.Metadata.DatItems/Formats/Disk.cs
index 3588e31e..13891e63 100644
--- a/SabreTools.Metadata.DatItems/Formats/Disk.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Disk.cs
@@ -1,7 +1,6 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Data.Extensions;
-using SabreTools.Metadata.Tools;
 using SabreTools.Text.Extensions;
 
 namespace SabreTools.Metadata.DatItems.Formats
diff --git a/SabreTools.Metadata.DatItems/Formats/Display.cs b/SabreTools.Metadata.DatItems/Formats/Display.cs
index 4efca375..177d155b 100644
--- a/SabreTools.Metadata.DatItems/Formats/Display.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Display.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 using SabreTools.Text.Extensions;
 
 namespace SabreTools.Metadata.DatItems.Formats
diff --git a/SabreTools.Metadata.DatItems/Formats/Driver.cs b/SabreTools.Metadata.DatItems/Formats/Driver.cs
index 30ed9988..56d91963 100644
--- a/SabreTools.Metadata.DatItems/Formats/Driver.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Driver.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Input.cs b/SabreTools.Metadata.DatItems/Formats/Input.cs
index 3f968764..3bccdcd5 100644
--- a/SabreTools.Metadata.DatItems/Formats/Input.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Input.cs
@@ -2,7 +2,6 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Data.Extensions;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/RamOption.cs b/SabreTools.Metadata.DatItems/Formats/RamOption.cs
index ceda917d..18aa3e30 100644
--- a/SabreTools.Metadata.DatItems/Formats/RamOption.cs
+++ b/SabreTools.Metadata.DatItems/Formats/RamOption.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Release.cs b/SabreTools.Metadata.DatItems/Formats/Release.cs
index f81eb9af..e49a83b9 100644
--- a/SabreTools.Metadata.DatItems/Formats/Release.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Release.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Formats/Rom.cs b/SabreTools.Metadata.DatItems/Formats/Rom.cs
index 17042b33..149aface 100644
--- a/SabreTools.Metadata.DatItems/Formats/Rom.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Rom.cs
@@ -1,7 +1,6 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Data.Extensions;
-using SabreTools.Metadata.Tools;
 using SabreTools.Text.Extensions;
 
 namespace SabreTools.Metadata.DatItems.Formats
diff --git a/SabreTools.Metadata.DatItems/Formats/SlotOption.cs b/SabreTools.Metadata.DatItems/Formats/SlotOption.cs
index c4a55b8f..6af8e1e0 100644
--- a/SabreTools.Metadata.DatItems/Formats/SlotOption.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SlotOption.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems.Formats
 {
diff --git a/SabreTools.Metadata.DatItems/Machine.cs b/SabreTools.Metadata.DatItems/Machine.cs
index b5c0e915..59e68c6c 100644
--- a/SabreTools.Metadata.DatItems/Machine.cs
+++ b/SabreTools.Metadata.DatItems/Machine.cs
@@ -3,7 +3,6 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Data.Extensions;
 using SabreTools.Metadata.Filter;
-using SabreTools.Metadata.Tools;
 using SabreTools.Text.Extensions;
 
 namespace SabreTools.Metadata.DatItems
diff --git a/SabreTools.Metadata.DatItems/Trurip.cs b/SabreTools.Metadata.DatItems/Trurip.cs
index e6927cf9..2aee3148 100644
--- a/SabreTools.Metadata.DatItems/Trurip.cs
+++ b/SabreTools.Metadata.DatItems/Trurip.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.DatItems
 {
diff --git a/SabreTools.Metadata.Filter/FilterKey.cs b/SabreTools.Metadata.Filter/FilterKey.cs
index 5efa1686..8419635b 100644
--- a/SabreTools.Metadata.Filter/FilterKey.cs
+++ b/SabreTools.Metadata.Filter/FilterKey.cs
@@ -1,6 +1,5 @@
 using System;
 using SabreTools.Data.Models.Metadata;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.Filter
 {
diff --git a/SabreTools.Metadata.Filter/FilterObject.cs b/SabreTools.Metadata.Filter/FilterObject.cs
index 997c586e..c3e0df41 100644
--- a/SabreTools.Metadata.Filter/FilterObject.cs
+++ b/SabreTools.Metadata.Filter/FilterObject.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
 using SabreTools.Data.Models.Metadata;
-using SabreTools.Metadata.Tools;
 using SabreTools.Text.Extensions;
 
 namespace SabreTools.Metadata.Filter
diff --git a/SabreTools.Metadata.Filter/FilterRunner.cs b/SabreTools.Metadata.Filter/FilterRunner.cs
index 3f8c0310..596c5266 100644
--- a/SabreTools.Metadata.Filter/FilterRunner.cs
+++ b/SabreTools.Metadata.Filter/FilterRunner.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using SabreTools.Data.Models.Metadata;
-using SabreTools.Metadata.Tools;
 
 namespace SabreTools.Metadata.Filter
 {
diff --git a/SabreTools.Metadata.Test/Tools/ConvertersTests.cs b/SabreTools.Metadata.Test/ConvertersTests.cs
similarity index 95%
rename from SabreTools.Metadata.Test/Tools/ConvertersTests.cs
rename to SabreTools.Metadata.Test/ConvertersTests.cs
index d840fa55..725aa233 100644
--- a/SabreTools.Metadata.Test/Tools/ConvertersTests.cs
+++ b/SabreTools.Metadata.Test/ConvertersTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace SabreTools.Metadata.Tools.Test
+namespace SabreTools.Metadata.Test
 {
     public class ConvertersTests
     {
diff --git a/SabreTools.Metadata.Test/Tools/UtilitiesTests.cs b/SabreTools.Metadata.Test/UtilitiesTests.cs
similarity index 98%
rename from SabreTools.Metadata.Test/Tools/UtilitiesTests.cs
rename to SabreTools.Metadata.Test/UtilitiesTests.cs
index a2f5111d..fdc34b8d 100644
--- a/SabreTools.Metadata.Test/Tools/UtilitiesTests.cs
+++ b/SabreTools.Metadata.Test/UtilitiesTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace SabreTools.Metadata.Tools.Test
+namespace SabreTools.Metadata.Test
 {
     public class UtilitiesTests
     {
diff --git a/SabreTools.Metadata/Tools/AttributeHelper.cs b/SabreTools.Metadata/AttributeHelper.cs
similarity index 97%
rename from SabreTools.Metadata/Tools/AttributeHelper.cs
rename to SabreTools.Metadata/AttributeHelper.cs
index ea95ffed..b74209c5 100644
--- a/SabreTools.Metadata/Tools/AttributeHelper.cs
+++ b/SabreTools.Metadata/AttributeHelper.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Metadata.Tools
+namespace SabreTools.Metadata
 {
     public static class AttributeHelper<T>
     {
diff --git a/SabreTools.Metadata/Tools/Converters.cs b/SabreTools.Metadata/Converters.cs
similarity index 99%
rename from SabreTools.Metadata/Tools/Converters.cs
rename to SabreTools.Metadata/Converters.cs
index dc4242ba..27f8eed3 100644
--- a/SabreTools.Metadata/Tools/Converters.cs
+++ b/SabreTools.Metadata/Converters.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SabreTools.Metadata.Tools
+namespace SabreTools.Metadata
 {
     public static class Converters
     {
diff --git a/SabreTools.Metadata/ModelBackedItemT.cs b/SabreTools.Metadata/ModelBackedItemT.cs
index 2e253f4a..2931a0d2 100644
--- a/SabreTools.Metadata/ModelBackedItemT.cs
+++ b/SabreTools.Metadata/ModelBackedItemT.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Metadata.Tools;
 using SabreTools.Text.Extensions;
 
 namespace SabreTools.Metadata
diff --git a/SabreTools.Metadata/Tools/TypeHelper.cs b/SabreTools.Metadata/TypeHelper.cs
similarity index 99%
rename from SabreTools.Metadata/Tools/TypeHelper.cs
rename to SabreTools.Metadata/TypeHelper.cs
index b869c4ac..b4c9122c 100644
--- a/SabreTools.Metadata/Tools/TypeHelper.cs
+++ b/SabreTools.Metadata/TypeHelper.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 using SabreTools.Data.Models;
 using SabreTools.Data.Models.Metadata;
 
-namespace SabreTools.Metadata.Tools
+namespace SabreTools.Metadata
 {
     public static class TypeHelper
     {
diff --git a/SabreTools.Metadata/Tools/Utilities.cs b/SabreTools.Metadata/Utilities.cs
similarity index 98%
rename from SabreTools.Metadata/Tools/Utilities.cs
rename to SabreTools.Metadata/Utilities.cs
index 71ec33ad..966e60d1 100644
--- a/SabreTools.Metadata/Tools/Utilities.cs
+++ b/SabreTools.Metadata/Utilities.cs
@@ -2,7 +2,7 @@
 using SabreTools.Hashing;
 using SabreTools.Text.Extensions;
 
-namespace SabreTools.Metadata.Tools
+namespace SabreTools.Metadata
 {
     /// <summary>
     /// Static utility functions used throughout the library