diff --git a/MapTo.sln b/MapTo.sln
index 1476ab5..9b0a09b 100644
--- a/MapTo.sln
+++ b/MapTo.sln
@@ -1,10 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapTo", "MapTo\MapTo.csproj", "{4DB371AC-48D0-4F01-8EF3-7707D06EF0A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapTo", "src\MapTo\MapTo.csproj", "{4DB371AC-48D0-4F01-8EF3-7707D06EF0A7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapToTests", "MapToTests\MapToTests.csproj", "{797DA57B-AC7E-468B-8799-44C5A574C0E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapToTests", "test\MapTo.Tests\MapTo.Tests.csproj", "{797DA57B-AC7E-468B-8799-44C5A574C0E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestConsoleApp", "TestConsoleApp\TestConsoleApp.csproj", "{5BE2551A-9EF9-42FA-B6D1-5B5E6A90CC85}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestConsoleApp", "test\TestConsoleApp\TestConsoleApp.csproj", "{5BE2551A-9EF9-42FA-B6D1-5B5E6A90CC85}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MapTo/CompilerServices/IsExternalInit.cs b/src/MapTo/CompilerServices/IsExternalInit.cs
similarity index 100%
rename from MapTo/CompilerServices/IsExternalInit.cs
rename to src/MapTo/CompilerServices/IsExternalInit.cs
diff --git a/MapTo/Diagnostics.cs b/src/MapTo/Diagnostics.cs
similarity index 100%
rename from MapTo/Diagnostics.cs
rename to src/MapTo/Diagnostics.cs
diff --git a/MapTo/Extensions/EnumerableExtensions.cs b/src/MapTo/Extensions/EnumerableExtensions.cs
similarity index 100%
rename from MapTo/Extensions/EnumerableExtensions.cs
rename to src/MapTo/Extensions/EnumerableExtensions.cs
diff --git a/MapTo/Extensions/RoslynExtensions.cs b/src/MapTo/Extensions/RoslynExtensions.cs
similarity index 100%
rename from MapTo/Extensions/RoslynExtensions.cs
rename to src/MapTo/Extensions/RoslynExtensions.cs
diff --git a/MapTo/Extensions/StringBuilderExtensions.cs b/src/MapTo/Extensions/StringBuilderExtensions.cs
similarity index 100%
rename from MapTo/Extensions/StringBuilderExtensions.cs
rename to src/MapTo/Extensions/StringBuilderExtensions.cs
diff --git a/MapTo/Extensions/StringExtensions.cs b/src/MapTo/Extensions/StringExtensions.cs
similarity index 100%
rename from MapTo/Extensions/StringExtensions.cs
rename to src/MapTo/Extensions/StringExtensions.cs
diff --git a/MapTo/Mapto.csproj b/src/MapTo/MapTo.csproj
similarity index 95%
rename from MapTo/Mapto.csproj
rename to src/MapTo/MapTo.csproj
index 1075960..93b8b26 100644
--- a/MapTo/Mapto.csproj
+++ b/src/MapTo/MapTo.csproj
@@ -33,7 +33,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="..\LICENSE" Pack="true" PackagePath="" Visible="false" />
+        <None Include="..\..\LICENSE" Pack="true" PackagePath="" Visible="false" />
         <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     </ItemGroup>
 </Project>
diff --git a/MapTo/MapToGenerator.cs b/src/MapTo/MapToGenerator.cs
similarity index 100%
rename from MapTo/MapToGenerator.cs
rename to src/MapTo/MapToGenerator.cs
diff --git a/MapTo/MapToSyntaxReceiver.cs b/src/MapTo/MapToSyntaxReceiver.cs
similarity index 100%
rename from MapTo/MapToSyntaxReceiver.cs
rename to src/MapTo/MapToSyntaxReceiver.cs
diff --git a/MapTo/Models/MapModel.cs b/src/MapTo/Models/MapModel.cs
similarity index 100%
rename from MapTo/Models/MapModel.cs
rename to src/MapTo/Models/MapModel.cs
diff --git a/MapTo/SourceBuilder.cs b/src/MapTo/SourceBuilder.cs
similarity index 100%
rename from MapTo/SourceBuilder.cs
rename to src/MapTo/SourceBuilder.cs
diff --git a/MapToTests/CSharpGenerator.cs b/test/MapTo.Tests/CSharpGenerator.cs
similarity index 100%
rename from MapToTests/CSharpGenerator.cs
rename to test/MapTo.Tests/CSharpGenerator.cs
diff --git a/MapToTests/MaptoTests.csproj b/test/MapTo.Tests/Mapto.Tests.csproj
similarity index 95%
rename from MapToTests/MaptoTests.csproj
rename to test/MapTo.Tests/Mapto.Tests.csproj
index 3507ec8..39b0ecd 100644
--- a/MapToTests/MaptoTests.csproj
+++ b/test/MapTo.Tests/Mapto.Tests.csproj
@@ -29,7 +29,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\MapTo\MapTo.csproj" />
+        <ProjectReference Include="..\..\src\MapTo\MapTo.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/MapToTests/Tests.cs b/test/MapTo.Tests/Tests.cs
similarity index 100%
rename from MapToTests/Tests.cs
rename to test/MapTo.Tests/Tests.cs
diff --git a/TestConsoleApp/Data/Models/User.cs b/test/TestConsoleApp/Data/Models/User.cs
similarity index 100%
rename from TestConsoleApp/Data/Models/User.cs
rename to test/TestConsoleApp/Data/Models/User.cs
diff --git a/TestConsoleApp/Program.cs b/test/TestConsoleApp/Program.cs
similarity index 100%
rename from TestConsoleApp/Program.cs
rename to test/TestConsoleApp/Program.cs
diff --git a/TestConsoleApp/TestConsoleApp.csproj b/test/TestConsoleApp/TestConsoleApp.csproj
similarity index 62%
rename from TestConsoleApp/TestConsoleApp.csproj
rename to test/TestConsoleApp/TestConsoleApp.csproj
index 103211f..f341935 100644
--- a/TestConsoleApp/TestConsoleApp.csproj
+++ b/test/TestConsoleApp/TestConsoleApp.csproj
@@ -6,6 +6,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\MapTo\MapTo.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+      <ProjectReference Include="..\..\src\MapTo\MapTo.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 </Project>
diff --git a/TestConsoleApp/ViewModels/User.cs b/test/TestConsoleApp/ViewModels/User.cs
similarity index 100%
rename from TestConsoleApp/ViewModels/User.cs
rename to test/TestConsoleApp/ViewModels/User.cs
diff --git a/TestConsoleApp/ViewModels/UserViewModel.cs b/test/TestConsoleApp/ViewModels/UserViewModel.cs
similarity index 100%
rename from TestConsoleApp/ViewModels/UserViewModel.cs
rename to test/TestConsoleApp/ViewModels/UserViewModel.cs