diff --git a/src/Pandatech.Crypto.sln b/Pandatech.Crypto.sln
similarity index 87%
rename from src/Pandatech.Crypto.sln
rename to Pandatech.Crypto.sln
index 4e6185a..9caca42 100644
--- a/src/Pandatech.Crypto.sln
+++ b/Pandatech.Crypto.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34024.191
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pandatech.Crypto.Tests", "../tests/Pandatech.Crypto.Tests\Pandatech.Crypto.Tests.csproj", "{89D6535F-549C-4091-BF21-96565F098C3F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pandatech.Crypto.Tests", "src/Pandatech.Crypto.Tests\Pandatech.Crypto.Tests.csproj", "{89D6535F-549C-4091-BF21-96565F098C3F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pandatech.Crypto", "Pandatech.Crypto\Pandatech.Crypto.csproj", "{97B88123-20B1-4F0A-82E7-DFDD08A03B7C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pandatech.Crypto", "src/Pandatech.Crypto\Pandatech.Crypto.csproj", "{97B88123-20B1-4F0A-82E7-DFDD08A03B7C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Pandatech.Crypto.sln.DotSettings b/Pandatech.Crypto.sln.DotSettings
similarity index 100%
rename from src/Pandatech.Crypto.sln.DotSettings
rename to Pandatech.Crypto.sln.DotSettings
diff --git a/tests/Pandatech.Crypto.Tests/Aes256Tests.cs b/src/Pandatech.Crypto.Tests/Aes256Tests.cs
similarity index 100%
rename from tests/Pandatech.Crypto.Tests/Aes256Tests.cs
rename to src/Pandatech.Crypto.Tests/Aes256Tests.cs
diff --git a/tests/Pandatech.Crypto.Tests/Argon2IdTests.cs b/src/Pandatech.Crypto.Tests/Argon2IdTests.cs
similarity index 100%
rename from tests/Pandatech.Crypto.Tests/Argon2IdTests.cs
rename to src/Pandatech.Crypto.Tests/Argon2IdTests.cs
diff --git a/tests/Pandatech.Crypto.Tests/GlobalUsings.cs b/src/Pandatech.Crypto.Tests/GlobalUsings.cs
similarity index 100%
rename from tests/Pandatech.Crypto.Tests/GlobalUsings.cs
rename to src/Pandatech.Crypto.Tests/GlobalUsings.cs
diff --git a/tests/Pandatech.Crypto.Tests/HostBuilderTests.cs b/src/Pandatech.Crypto.Tests/HostBuilderTests.cs
similarity index 100%
rename from tests/Pandatech.Crypto.Tests/HostBuilderTests.cs
rename to src/Pandatech.Crypto.Tests/HostBuilderTests.cs
diff --git a/tests/Pandatech.Crypto.Tests/Pandatech.Crypto.Tests.csproj b/src/Pandatech.Crypto.Tests/Pandatech.Crypto.Tests.csproj
similarity index 92%
rename from tests/Pandatech.Crypto.Tests/Pandatech.Crypto.Tests.csproj
rename to src/Pandatech.Crypto.Tests/Pandatech.Crypto.Tests.csproj
index a579b60..4231b75 100644
--- a/tests/Pandatech.Crypto.Tests/Pandatech.Crypto.Tests.csproj
+++ b/src/Pandatech.Crypto.Tests/Pandatech.Crypto.Tests.csproj
@@ -23,7 +23,7 @@