diff --git a/Threenine.Map.sln b/Threenine.Map.sln
index 4629707..642e523 100644
--- a/Threenine.Map.sln
+++ b/Threenine.Map.sln
@@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Threenine.Map", "src\Threenine.Map.csproj", "{1CDD5884-E7D3-435B-B0FC-30DAC41B3B94}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{1F5C8EB2-12EE-4ACE-9084-1F9C4474CC84}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1F5C8EB2-12EE-4ACE-9084-1F9C4474CC84}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapperTests", "UnitTests\MapperTests\MapperTests.csproj", "{9BF2645A-007C-4402-9AAB-08F813CBF680}"
 EndProject
diff --git a/UnitTests/DomainObjects/ComplexDomainObject.cs b/tests/DomainObjects/ComplexDomainObject.cs
similarity index 100%
rename from UnitTests/DomainObjects/ComplexDomainObject.cs
rename to tests/DomainObjects/ComplexDomainObject.cs
diff --git a/UnitTests/DomainObjects/DomainObjects.csproj b/tests/DomainObjects/DomainObjects.csproj
similarity index 100%
rename from UnitTests/DomainObjects/DomainObjects.csproj
rename to tests/DomainObjects/DomainObjects.csproj
diff --git a/UnitTests/DomainObjects/SimpleDomainObject.cs b/tests/DomainObjects/SimpleDomainObject.cs
similarity index 100%
rename from UnitTests/DomainObjects/SimpleDomainObject.cs
rename to tests/DomainObjects/SimpleDomainObject.cs
diff --git a/UnitTests/EntityObjects/EntityObjects.csproj b/tests/EntityObjects/EntityObjects.csproj
similarity index 95%
rename from UnitTests/EntityObjects/EntityObjects.csproj
rename to tests/EntityObjects/EntityObjects.csproj
index 34824bd..7ac1b71 100644
--- a/UnitTests/EntityObjects/EntityObjects.csproj
+++ b/tests/EntityObjects/EntityObjects.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Threenine.Map.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Threenine.Map.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/UnitTests/EntityObjects/SimpleEntity.cs b/tests/EntityObjects/SimpleEntity.cs
similarity index 94%
rename from UnitTests/EntityObjects/SimpleEntity.cs
rename to tests/EntityObjects/SimpleEntity.cs
index 9fa413a..a602824 100644
--- a/UnitTests/EntityObjects/SimpleEntity.cs
+++ b/tests/EntityObjects/SimpleEntity.cs
@@ -1,12 +1,12 @@
-using System;
-
-
-namespace EntityObjects
-{
-    public class SimpleEntity 
-    {
-        public string Name { get; set; }
-        public string Description { get; set; }
-        public int Age { get; set; }
-    }
-}
+using System;
+
+
+namespace EntityObjects
+{
+    public class SimpleEntity 
+    {
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public int Age { get; set; }
+    }
+}
diff --git a/UnitTests/MapperTests/ComplexDomainObjectTests.cs b/tests/MapperTests/ComplexDomainObjectTests.cs
similarity index 100%
rename from UnitTests/MapperTests/ComplexDomainObjectTests.cs
rename to tests/MapperTests/ComplexDomainObjectTests.cs
diff --git a/UnitTests/MapperTests/MapperFixture.cs b/tests/MapperTests/MapperFixture.cs
similarity index 100%
rename from UnitTests/MapperTests/MapperFixture.cs
rename to tests/MapperTests/MapperFixture.cs
diff --git a/UnitTests/MapperTests/MapperTests.csproj b/tests/MapperTests/MapperTests.csproj
similarity index 100%
rename from UnitTests/MapperTests/MapperTests.csproj
rename to tests/MapperTests/MapperTests.csproj
diff --git a/UnitTests/MapperTests/SimpleDomainObjectTests.cs b/tests/MapperTests/SimpleDomainObjectTests.cs
similarity index 100%
rename from UnitTests/MapperTests/SimpleDomainObjectTests.cs
rename to tests/MapperTests/SimpleDomainObjectTests.cs
diff --git a/UnitTests/MapperTests/TestCollection.cs b/tests/MapperTests/TestCollection.cs
similarity index 100%
rename from UnitTests/MapperTests/TestCollection.cs
rename to tests/MapperTests/TestCollection.cs
diff --git a/website/website.md b/website/website.md
deleted file mode 100644
index e69de29..0000000