diff --git a/SabreTools.ASN1.sln b/SabreTools.ASN1.sln
index 2e07a4f..1917861 100644
--- a/SabreTools.ASN1.sln
+++ b/SabreTools.ASN1.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.ASN1", "SabreTools.ASN1.csproj", "{88EA40DD-E313-479C-94EA-0AB948DB4720}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.ASN1", "SabreTools.ASN1\SabreTools.ASN1.csproj", "{88EA40DD-E313-479C-94EA-0AB948DB4720}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/AbstractSyntaxNotationOne.cs b/SabreTools.ASN1/AbstractSyntaxNotationOne.cs
similarity index 100%
rename from AbstractSyntaxNotationOne.cs
rename to SabreTools.ASN1/AbstractSyntaxNotationOne.cs
diff --git a/Enums.cs b/SabreTools.ASN1/Enums.cs
similarity index 100%
rename from Enums.cs
rename to SabreTools.ASN1/Enums.cs
diff --git a/ObjectIdentifier.ASN1.cs b/SabreTools.ASN1/ObjectIdentifier.ASN1.cs
similarity index 100%
rename from ObjectIdentifier.ASN1.cs
rename to SabreTools.ASN1/ObjectIdentifier.ASN1.cs
diff --git a/ObjectIdentifier.ModifiedOIDIRI.cs b/SabreTools.ASN1/ObjectIdentifier.ModifiedOIDIRI.cs
similarity index 100%
rename from ObjectIdentifier.ModifiedOIDIRI.cs
rename to SabreTools.ASN1/ObjectIdentifier.ModifiedOIDIRI.cs
diff --git a/ObjectIdentifier.OIDIRI.cs b/SabreTools.ASN1/ObjectIdentifier.OIDIRI.cs
similarity index 100%
rename from ObjectIdentifier.OIDIRI.cs
rename to SabreTools.ASN1/ObjectIdentifier.OIDIRI.cs
diff --git a/ObjectIdentifier.cs b/SabreTools.ASN1/ObjectIdentifier.cs
similarity index 100%
rename from ObjectIdentifier.cs
rename to SabreTools.ASN1/ObjectIdentifier.cs
diff --git a/ObjectIdentifier.dot.cs b/SabreTools.ASN1/ObjectIdentifier.dot.cs
similarity index 100%
rename from ObjectIdentifier.dot.cs
rename to SabreTools.ASN1/ObjectIdentifier.dot.cs
diff --git a/SabreTools.ASN1.csproj b/SabreTools.ASN1/SabreTools.ASN1.csproj
similarity index 100%
rename from SabreTools.ASN1.csproj
rename to SabreTools.ASN1/SabreTools.ASN1.csproj
diff --git a/TypeLengthValue.cs b/SabreTools.ASN1/TypeLengthValue.cs
similarity index 100%
rename from TypeLengthValue.cs
rename to SabreTools.ASN1/TypeLengthValue.cs
diff --git a/publish-nix.sh b/publish-nix.sh
index eb59692..b7b92de 100755
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -32,5 +32,5 @@ then
     dotnet restore
 
     # Create Nuget Package
-    dotnet pack SabreTools.ASN1.csproj --output $BUILD_FOLDER
+    dotnet pack SabreTools.ASN1/SabreTools.ASN1.csproj --output $BUILD_FOLDER
 fi
\ No newline at end of file
diff --git a/publish-win.ps1 b/publish-win.ps1
index d89e7a2..27e4615 100644
--- a/publish-win.ps1
+++ b/publish-win.ps1
@@ -22,5 +22,5 @@ if (!$NO_BUILD.IsPresent)
     dotnet restore
 
     # Create Nuget Package
-    dotnet pack SabreTools.ASN1.csproj --output $BUILD_FOLDER
+    dotnet pack SabreTools.ASN1\SabreTools.ASN1.csproj --output $BUILD_FOLDER
 }