diff --git a/DocGen/docfx.json b/DocGen/docfx.json
index 266af8d..c61a4f6 100644
--- a/DocGen/docfx.json
+++ b/DocGen/docfx.json
@@ -3,7 +3,7 @@
         {
             "src": [
                 {
-                    "files": [ "Metalinker/**.csproj" ],
+                    "files": [ "public/**/*.csproj" ],
                     "src": ".."
                 }
             ],
diff --git a/Metalinker.sln b/Metalinker.sln
index 8ec8c02..4bf447e 100644
--- a/Metalinker.sln
+++ b/Metalinker.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35219.272
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker", "Metalinker\Metalinker.csproj", "{ED990317-51BA-4B0F-85B0-A74B604904F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker", "public\Metalinker\Metalinker.csproj", "{ED990317-51BA-4B0F-85B0-A74B604904F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker.Tests", "Metalinker.Tests\Metalinker.Tests.csproj", "{D532EF5D-097F-4193-ADEE-E6990C9B3425}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker.Tests", "private\Metalinker.Tests\Metalinker.Tests.csproj", "{D532EF5D-097F-4193-ADEE-E6990C9B3425}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{BEFE2FE1-8B1B-473D-A9A8-03D105E15F0A}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{BEFE2F
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Public", "Public", "{D0C3AB38-B69A-40E4-B6A7-8B0AE4D8DC82}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Private", "Private", "{6309B122-0AD8-42A8-BB4B-F409C47B94B9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -32,6 +36,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{ED990317-51BA-4B0F-85B0-A74B604904F3} = {D0C3AB38-B69A-40E4-B6A7-8B0AE4D8DC82}
+		{D532EF5D-097F-4193-ADEE-E6990C9B3425} = {6309B122-0AD8-42A8-BB4B-F409C47B94B9}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {19FE220C-BDE4-4AAC-810A-70CFAE46E56B}
 	EndGlobalSection
diff --git a/README.md b/README.md
index 6e2be02..2e37e09 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 <br>
     
 <img
-  src = 'https://cdn.jsdelivr.net/gh/Aptivi/Metalinker@main/Metalinker/OfficialAppIcon-Metalinker-512.png'
+  src = 'https://cdn.jsdelivr.net/gh/Aptivi/Metalinker@main/assets/OfficialAppIcon-Metalinker-512.png'
   width = 256
   align = center
 />
diff --git a/Metalinker/OfficialAppIcon-Metalinker-512.png b/assets/OfficialAppIcon-Metalinker-512.png
similarity index 100%
rename from Metalinker/OfficialAppIcon-Metalinker-512.png
rename to assets/OfficialAppIcon-Metalinker-512.png
diff --git a/Metalinker.Tests/MetalinkLoader.cs b/private/Metalinker.Tests/MetalinkLoader.cs
similarity index 100%
rename from Metalinker.Tests/MetalinkLoader.cs
rename to private/Metalinker.Tests/MetalinkLoader.cs
diff --git a/Metalinker.Tests/MetalinkParserTests.cs b/private/Metalinker.Tests/MetalinkParserTests.cs
similarity index 100%
rename from Metalinker.Tests/MetalinkParserTests.cs
rename to private/Metalinker.Tests/MetalinkParserTests.cs
diff --git a/Metalinker.Tests/Metalinker.Tests.csproj b/private/Metalinker.Tests/Metalinker.Tests.csproj
similarity index 83%
rename from Metalinker.Tests/Metalinker.Tests.csproj
rename to private/Metalinker.Tests/Metalinker.Tests.csproj
index 798a59f..80746dd 100644
--- a/Metalinker.Tests/Metalinker.Tests.csproj
+++ b/private/Metalinker.Tests/Metalinker.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Metalinker\Metalinker.csproj" />
+    <ProjectReference Include="..\..\public\Metalinker\Metalinker.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Metalinker.Tests/Resources/slackware15.iso.meta4 b/private/Metalinker.Tests/Resources/slackware15.iso.meta4
similarity index 100%
rename from Metalinker.Tests/Resources/slackware15.iso.meta4
rename to private/Metalinker.Tests/Resources/slackware15.iso.meta4
diff --git a/Metalinker.Tests/Resources/slackware15.iso.metalink b/private/Metalinker.Tests/Resources/slackware15.iso.metalink
similarity index 100%
rename from Metalinker.Tests/Resources/slackware15.iso.metalink
rename to private/Metalinker.Tests/Resources/slackware15.iso.metalink
diff --git a/Metalinker/Instances/Metalink.cs b/public/Metalinker/Instances/Metalink.cs
similarity index 100%
rename from Metalinker/Instances/Metalink.cs
rename to public/Metalinker/Instances/Metalink.cs
diff --git a/Metalinker/Instances/MetalinkFile.cs b/public/Metalinker/Instances/MetalinkFile.cs
similarity index 100%
rename from Metalinker/Instances/MetalinkFile.cs
rename to public/Metalinker/Instances/MetalinkFile.cs
diff --git a/Metalinker/Instances/MetalinkHash.cs b/public/Metalinker/Instances/MetalinkHash.cs
similarity index 100%
rename from Metalinker/Instances/MetalinkHash.cs
rename to public/Metalinker/Instances/MetalinkHash.cs
diff --git a/Metalinker/Instances/MetalinkPieceInfo.cs b/public/Metalinker/Instances/MetalinkPieceInfo.cs
similarity index 100%
rename from Metalinker/Instances/MetalinkPieceInfo.cs
rename to public/Metalinker/Instances/MetalinkPieceInfo.cs
diff --git a/Metalinker/Instances/MetalinkResource.cs b/public/Metalinker/Instances/MetalinkResource.cs
similarity index 100%
rename from Metalinker/Instances/MetalinkResource.cs
rename to public/Metalinker/Instances/MetalinkResource.cs
diff --git a/Metalinker/Instances/MetalinkSignature.cs b/public/Metalinker/Instances/MetalinkSignature.cs
similarity index 100%
rename from Metalinker/Instances/MetalinkSignature.cs
rename to public/Metalinker/Instances/MetalinkSignature.cs
diff --git a/Metalinker/Instances/MetalinkVersion.cs b/public/Metalinker/Instances/MetalinkVersion.cs
similarity index 100%
rename from Metalinker/Instances/MetalinkVersion.cs
rename to public/Metalinker/Instances/MetalinkVersion.cs
diff --git a/Metalinker/MetalinkParser.cs b/public/Metalinker/MetalinkParser.cs
similarity index 100%
rename from Metalinker/MetalinkParser.cs
rename to public/Metalinker/MetalinkParser.cs
diff --git a/Metalinker/Metalinker.csproj b/public/Metalinker/Metalinker.csproj
similarity index 92%
rename from Metalinker/Metalinker.csproj
rename to public/Metalinker/Metalinker.csproj
index 6aa2339..beeb612 100644
--- a/Metalinker/Metalinker.csproj
+++ b/public/Metalinker/Metalinker.csproj
@@ -18,14 +18,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\README.md">
+    <None Include="..\..\README.md">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="OfficialAppIcon-Metalinker-512.png">
+    <None Include="..\..\assets\OfficialAppIcon-Metalinker-512.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
diff --git a/Metalinker/Parsers/Metalink3.cs b/public/Metalinker/Parsers/Metalink3.cs
similarity index 100%
rename from Metalinker/Parsers/Metalink3.cs
rename to public/Metalinker/Parsers/Metalink3.cs
diff --git a/Metalinker/Parsers/Metalink4.cs b/public/Metalinker/Parsers/Metalink4.cs
similarity index 100%
rename from Metalinker/Parsers/Metalink4.cs
rename to public/Metalinker/Parsers/Metalink4.cs
diff --git a/tools/push.sh b/tools/push.sh
index c8183af..6ce8513 100644
--- a/tools/push.sh
+++ b/tools/push.sh
@@ -36,7 +36,7 @@ checkerror $? "dotnet is not found"
 
 # Push packages
 echo Pushing packages...
-find .. -type f -path "*/bin/$releaseconf/*.nupkg" -exec dotnet nuget push {} --api-key $NUGET_APIKEY --source "nuget.org" \;
+find .. -type f -path "**/bin/$releaseconf/*.nupkg" -exec dotnet nuget push {} --api-key $NUGET_APIKEY --source "nuget.org" \;
 checkerror $? "Failed to push"
 
 # Inform success