diff --git a/Ed25519 Tests/Ed25519 Tests.csproj b/Ed25519 Tests/Ed25519 Tests.csproj
deleted file mode 100644
index 57d11d6..0000000
--- a/Ed25519 Tests/Ed25519 Tests.csproj	
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>Ed25519_Tests</RootNamespace>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ed25519\Ed25519.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/Ed25519.sln b/Ed25519.sln
index ed1a8ed..620cf86 100644
--- a/Ed25519.sln
+++ b/Ed25519.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ed25519", "Ed25519\Ed25519.csproj", "{A36D2E95-E99A-4CB4-B735-417BAE007BC7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ed25519 Tests", "Ed25519 Tests\Ed25519 Tests.csproj", "{7CF58545-8CB8-4B23-82DF-D1E71679151C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{A36D2E95-E99A-4CB4-B735-417BAE007BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A36D2E95-E99A-4CB4-B735-417BAE007BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A36D2E95-E99A-4CB4-B735-417BAE007BC7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CF58545-8CB8-4B23-82DF-D1E71679151C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CF58545-8CB8-4B23-82DF-D1E71679151C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CF58545-8CB8-4B23-82DF-D1E71679151C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CF58545-8CB8-4B23-82DF-D1E71679151C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Ed25519/Ed25519.csproj b/Ed25519/Ed25519.csproj
index 485a24f..b097b07 100644
--- a/Ed25519/Ed25519.csproj
+++ b/Ed25519/Ed25519.csproj
@@ -26,6 +26,12 @@
 
   <ItemGroup>
     <PackageReference Include="Encrypter" Version="1.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/Ed25519/EdPoint.cs b/Ed25519/EdPoint.cs
index 59a237a..44a3a7f 100644
--- a/Ed25519/EdPoint.cs
+++ b/Ed25519/EdPoint.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace Ed25519
 {
-    public struct EdPoint
+    internal struct EdPoint
     {
         public BigInteger X { get; set; }
 
diff --git a/Ed25519/Extensions.cs b/Ed25519/Extensions.cs
index bbd9aae..b90d4d4 100644
--- a/Ed25519/Extensions.cs
+++ b/Ed25519/Extensions.cs
@@ -55,7 +55,7 @@ namespace Ed25519
             return x;
         }
 
-        public static BigInteger ExpMod(this BigInteger number, BigInteger exponent, BigInteger modulo)
+        internal static BigInteger ExpMod(this BigInteger number, BigInteger exponent, BigInteger modulo)
         {
             var numberOperations = (int)Math.Ceiling(BigInteger.Log(exponent, 2)) + 1;
             var series = new bool[numberOperations];
diff --git a/Ed25519 Tests/EdPointTests.cs b/Ed25519/Tests/EdPointTests.cs
similarity index 90%
rename from Ed25519 Tests/EdPointTests.cs
rename to Ed25519/Tests/EdPointTests.cs
index 513354d..d12c20d 100644
--- a/Ed25519 Tests/EdPointTests.cs	
+++ b/Ed25519/Tests/EdPointTests.cs
@@ -2,12 +2,11 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Text;
-using Ed25519;
 using NUnit.Framework;
 
-namespace Ed25519_Tests
+namespace Ed25519
 {
-    public sealed class EdPointTests
+    internal sealed class EdPointTests
     {
         [Test]
         public void TestScalMul01()
diff --git a/Ed25519 Tests/SignerTests.cs b/Ed25519/Tests/SignerTests.cs
similarity index 97%
rename from Ed25519 Tests/SignerTests.cs
rename to Ed25519/Tests/SignerTests.cs
index 44829a1..6a876a1 100644
--- a/Ed25519 Tests/SignerTests.cs	
+++ b/Ed25519/Tests/SignerTests.cs
@@ -4,12 +4,11 @@ using System.Diagnostics;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using Ed25519;
 using NUnit.Framework;
 
-namespace Ed25519_Tests
+namespace Ed25519
 {
-    public sealed class SignerTests
+    internal sealed class SignerTests
     {
         [Test]
         public void TestSignatureLength()