diff --git a/README.MD b/README.MD
index 8b45ffc9..a3fdf6b8 100644
--- a/README.MD
+++ b/README.MD
@@ -117,7 +117,7 @@ Below is a table of all namespaces within the library and what they represent
 | `SabreTools.Data.Attributes` | Common attributes for data marking and manipulation |
 | `SabreTools.Data.Extensions` | Extension methods related to models |
 | `SabreTools.Data.Models` | Models representing different file and structure types |
-| `SabreTools.Data.ObjectIdentifier` | Object Identifier (OID) parsing |
+| `SabreTools.ObjectIdentifier` | Object Identifier (OID) parsing |
 | `SabreTools.Serialization.CrossModel` | Convert between models; mainly used for metadata files converting to and from a common, `Dictionary`-based model |
 | `SabreTools.Serialization.Readers` | Convert from external sources to models |
 | `SabreTools.Serialization.Wrappers` | Classes that wrap serialization and models to allow for including extension properties |
diff --git a/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs b/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs
index ce4beb70..8457b196 100644
--- a/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs
+++ b/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs
@@ -1,4 +1,4 @@
-using SabreTools.Data.ObjectIdentifier;
+using SabreTools.ObjectIdentifier;
 using Xunit;
 
 namespace SabreTools.Serialization.Test.ObjectIdentifier
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValue.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValue.cs
index 702f07a2..f0ce4263 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValue.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValue.cs
@@ -2,7 +2,7 @@ using System;
 using System.Numerics;
 using System.Text;
 using SabreTools.Data.Models.ASN1;
-using SabreTools.Data.ObjectIdentifier;
+using SabreTools.ObjectIdentifier;
 
 namespace SabreTools.Data.Extensions
 {
diff --git a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.ASN1.cs b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ASN1.cs
similarity index 94%
rename from SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.ASN1.cs
rename to SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ASN1.cs
index 1bc1c3fa..6708840c 100644
--- a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.ASN1.cs
+++ b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ASN1.cs
@@ -1,5 +1,5 @@
 #pragma warning disable IDE0060 // Remove unused parameter
-namespace SabreTools.Data.ObjectIdentifier
+namespace SabreTools.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and ASN.1 notation
diff --git a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.ModifiedOIDIRI.cs b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
similarity index 99%
rename from SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
rename to SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
index f05f073b..eeecd470 100644
--- a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
+++ b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace SabreTools.Data.ObjectIdentifier
+namespace SabreTools.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and OID-IRI formatting
diff --git a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.OIDIRI.cs b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.OIDIRI.cs
similarity index 99%
rename from SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.OIDIRI.cs
rename to SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.OIDIRI.cs
index 51556619..d6a04009 100644
--- a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.OIDIRI.cs
+++ b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.OIDIRI.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace SabreTools.Data.ObjectIdentifier
+namespace SabreTools.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and OID-IRI formatting
diff --git a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.cs b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.cs
similarity index 98%
rename from SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.cs
rename to SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.cs
index 718c1ceb..cf9b3121 100644
--- a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.cs
+++ b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SabreTools.Data.ObjectIdentifier
+namespace SabreTools.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID)
diff --git a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.dot.cs b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.dot.cs
similarity index 95%
rename from SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.dot.cs
rename to SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.dot.cs
index 89668169..a629e05e 100644
--- a/SabreTools.Serialization/SabreTools.Data.ObjectIdentifier/Parser.dot.cs
+++ b/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.dot.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Data.ObjectIdentifier
+namespace SabreTools.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and dot notation