diff --git a/README.MD b/README.MD
index a4dcdf3a..0028d540 100644
--- a/README.MD
+++ b/README.MD
@@ -108,12 +108,12 @@ Below is a table of all namespaces within the library and what they represent
 
 | Namespace | Description |
 | --- | --- |
+| `SabreTools.Data.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.Deserializers` | Convert from external sources to models |
 | `SabreTools.Serialization.Extensions` | Extension methods for both models and wrappers |
 | `SabreTools.Serialization.Interfaces` | Interfaces used commonly throughout the library |
 | `SabreTools.Serialization.Models` | Models representing different file and structure types |
-| `SabreTools.Serialization.ObjectIdentifier` | Object Identifier (OID) parsing |
 | `SabreTools.Serialization.Printers` | Export model information in a formatted manner |
 | `SabreTools.Serialization.Serializers` | Convert from models to external sources |
 | `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 1aaf4c79..676cff23 100644
--- a/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs
+++ b/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs
@@ -1,4 +1,4 @@
-using SabreTools.Serialization.ObjectIdentifier;
+using SabreTools.Data.ObjectIdentifier;
 using Xunit;
 
 namespace SabreTools.Serialization.Test.ObjectIdentifier
diff --git a/SabreTools.Serialization/Extensions/TypeLengthValue.cs b/SabreTools.Serialization/Extensions/TypeLengthValue.cs
index 3a3edf51..1cbacf7d 100644
--- a/SabreTools.Serialization/Extensions/TypeLengthValue.cs
+++ b/SabreTools.Serialization/Extensions/TypeLengthValue.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Numerics;
 using System.Text;
+using SabreTools.Data.ObjectIdentifier;
 using SabreTools.Serialization.Models.ASN1;
-using SabreTools.Serialization.ObjectIdentifier;
 
 namespace SabreTools.Serialization.Extensions
 {
diff --git a/SabreTools.Serialization/ObjectIdentifier/Parser.ASN1.cs b/SabreTools.Serialization/ObjectIdentifier/Parser.ASN1.cs
index 86f4ff69..f89959b0 100644
--- a/SabreTools.Serialization/ObjectIdentifier/Parser.ASN1.cs
+++ b/SabreTools.Serialization/ObjectIdentifier/Parser.ASN1.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Serialization.ObjectIdentifier
+namespace SabreTools.Data.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and ASN.1 notation
diff --git a/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs b/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs
index 984f9a94..8266770c 100644
--- a/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs
+++ b/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs
@@ -4,7 +4,7 @@ using System.Text;
 #pragma warning disable CS0162 // Unreachable code detected
 #pragma warning disable CS0164 // This label has not been referenced
 
-namespace SabreTools.Serialization.ObjectIdentifier
+namespace SabreTools.Data.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and OID-IRI formatting
diff --git a/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs b/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs
index 8f0cfb34..452d18d8 100644
--- a/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs
+++ b/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace SabreTools.Serialization.ObjectIdentifier
+namespace SabreTools.Data.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and OID-IRI formatting
diff --git a/SabreTools.Serialization/ObjectIdentifier/Parser.cs b/SabreTools.Serialization/ObjectIdentifier/Parser.cs
index 9220f661..718c1ceb 100644
--- a/SabreTools.Serialization/ObjectIdentifier/Parser.cs
+++ b/SabreTools.Serialization/ObjectIdentifier/Parser.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SabreTools.Serialization.ObjectIdentifier
+namespace SabreTools.Data.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID)
diff --git a/SabreTools.Serialization/ObjectIdentifier/Parser.dot.cs b/SabreTools.Serialization/ObjectIdentifier/Parser.dot.cs
index 159d9597..2e21e532 100644
--- a/SabreTools.Serialization/ObjectIdentifier/Parser.dot.cs
+++ b/SabreTools.Serialization/ObjectIdentifier/Parser.dot.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Serialization.ObjectIdentifier
+namespace SabreTools.Data.ObjectIdentifier
 {
     /// <summary>
     /// Methods related to Object Identifiers (OID) and dot notation