diff --git a/EightBit.sln b/EightBit.sln
index 9652858..31a5b07 100644
--- a/EightBit.sln
+++ b/EightBit.sln
@@ -7,9 +7,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EightBit", "EightBit\EightB
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M6502", "M6502\M6502.csproj", "{3AF29A4F-4294-4A9D-AAC3-D9A48076BD19}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M6502.Test", "Test_M6502\M6502.Test.csproj", "{854EDE2F-B54D-425C-8F68-EDA68BDC797E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EightBit.UnitTest", "EightBit\EightBit.UnitTest\EightBit.UnitTest.csproj", "{AA8282A3-212A-42DE-B778-BBAEB7E6D986}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EightBit.UnitTest", "UnitTestEightBit\EightBit.UnitTest.csproj", "{AA8282A3-212A-42DE-B778-BBAEB7E6D986}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M6502.Test", "M6502\M6502.Test\M6502.Test.csproj", "{854EDE2F-B54D-425C-8F68-EDA68BDC797E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,18 +45,6 @@ Global
 		{3AF29A4F-4294-4A9D-AAC3-D9A48076BD19}.Release|x64.Build.0 = Release|Any CPU
 		{3AF29A4F-4294-4A9D-AAC3-D9A48076BD19}.Release|x86.ActiveCfg = Release|Any CPU
 		{3AF29A4F-4294-4A9D-AAC3-D9A48076BD19}.Release|x86.Build.0 = Release|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x64.Build.0 = Debug|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x86.Build.0 = Debug|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x64.ActiveCfg = Release|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x64.Build.0 = Release|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x86.ActiveCfg = Release|Any CPU
-		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x86.Build.0 = Release|Any CPU
 		{AA8282A3-212A-42DE-B778-BBAEB7E6D986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA8282A3-212A-42DE-B778-BBAEB7E6D986}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA8282A3-212A-42DE-B778-BBAEB7E6D986}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -69,6 +57,18 @@ Global
 		{AA8282A3-212A-42DE-B778-BBAEB7E6D986}.Release|x64.Build.0 = Release|Any CPU
 		{AA8282A3-212A-42DE-B778-BBAEB7E6D986}.Release|x86.ActiveCfg = Release|Any CPU
 		{AA8282A3-212A-42DE-B778-BBAEB7E6D986}.Release|x86.Build.0 = Release|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x64.Build.0 = Debug|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Debug|x86.Build.0 = Debug|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x64.ActiveCfg = Release|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x64.Build.0 = Release|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x86.ActiveCfg = Release|Any CPU
+		{854EDE2F-B54D-425C-8F68-EDA68BDC797E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UnitTestEightBit/ChipUnitTest.cs b/EightBit/EightBit.UnitTest/ChipUnitTest.cs
similarity index 100%
rename from UnitTestEightBit/ChipUnitTest.cs
rename to EightBit/EightBit.UnitTest/ChipUnitTest.cs
diff --git a/UnitTestEightBit/EightBit.UnitTest.csproj b/EightBit/EightBit.UnitTest/EightBit.UnitTest.csproj
similarity index 98%
rename from UnitTestEightBit/EightBit.UnitTest.csproj
rename to EightBit/EightBit.UnitTest/EightBit.UnitTest.csproj
index 929f783..47c3936 100644
--- a/UnitTestEightBit/EightBit.UnitTest.csproj
+++ b/EightBit/EightBit.UnitTest/EightBit.UnitTest.csproj
@@ -59,7 +59,7 @@
     <AdditionalFiles Include="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EightBit\EightBit.csproj">
+    <ProjectReference Include="..\EightBit.csproj">
       <Project>{6ebf8857-62a3-4ef4-af21-c1844031d7e4}</Project>
       <Name>EightBit</Name>
     </ProjectReference>
diff --git a/UnitTestEightBit/Properties/AssemblyInfo.cs b/EightBit/EightBit.UnitTest/Properties/AssemblyInfo.cs
similarity index 100%
rename from UnitTestEightBit/Properties/AssemblyInfo.cs
rename to EightBit/EightBit.UnitTest/Properties/AssemblyInfo.cs
diff --git a/UnitTestEightBit/packages.config b/EightBit/EightBit.UnitTest/packages.config
similarity index 100%
rename from UnitTestEightBit/packages.config
rename to EightBit/EightBit.UnitTest/packages.config
diff --git a/Test_M6502/stylecop.json b/EightBit/EightBit.UnitTest/stylecop.json
similarity index 100%
rename from Test_M6502/stylecop.json
rename to EightBit/EightBit.UnitTest/stylecop.json
diff --git a/Test_M6502/App.config b/M6502/M6502.Test/App.config
similarity index 100%
rename from Test_M6502/App.config
rename to M6502/M6502.Test/App.config
diff --git a/Test_M6502/Board.cs b/M6502/M6502.Test/Board.cs
similarity index 100%
rename from Test_M6502/Board.cs
rename to M6502/M6502.Test/Board.cs
diff --git a/Test_M6502/Configuration.cs b/M6502/M6502.Test/Configuration.cs
similarity index 100%
rename from Test_M6502/Configuration.cs
rename to M6502/M6502.Test/Configuration.cs
diff --git a/Test_M6502/M6502.Test.csproj b/M6502/M6502.Test/M6502.Test.csproj
similarity index 86%
rename from Test_M6502/M6502.Test.csproj
rename to M6502/M6502.Test/M6502.Test.csproj
index e4544e6..0888262 100644
--- a/Test_M6502/M6502.Test.csproj
+++ b/M6502/M6502.Test/M6502.Test.csproj
@@ -54,22 +54,24 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <AdditionalFiles Include="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EightBit\EightBit.csproj">
+    <ProjectReference Include="..\..\EightBit\EightBit.csproj">
       <Project>{6ebf8857-62a3-4ef4-af21-c1844031d7e4}</Project>
       <Name>EightBit</Name>
     </ProjectReference>
-    <ProjectReference Include="..\M6502\M6502.csproj">
+    <ProjectReference Include="..\M6502.csproj">
       <Project>{3af29a4f-4294-4a9d-aac3-d9a48076bd19}</Project>
       <Name>M6502</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.Unstable.1.1.1.61\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.Unstable.1.1.1.61\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.Unstable.1.1.1.61\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.Unstable.1.1.1.61\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test_M6502/Program.cs b/M6502/M6502.Test/Program.cs
similarity index 100%
rename from Test_M6502/Program.cs
rename to M6502/M6502.Test/Program.cs
diff --git a/Test_M6502/Properties/AssemblyInfo.cs b/M6502/M6502.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from Test_M6502/Properties/AssemblyInfo.cs
rename to M6502/M6502.Test/Properties/AssemblyInfo.cs
diff --git a/Test_M6502/TestHarness.cs b/M6502/M6502.Test/TestHarness.cs
similarity index 100%
rename from Test_M6502/TestHarness.cs
rename to M6502/M6502.Test/TestHarness.cs
diff --git a/Test_M6502/packages.config b/M6502/M6502.Test/packages.config
similarity index 100%
rename from Test_M6502/packages.config
rename to M6502/M6502.Test/packages.config
diff --git a/Test_M6502/roms/.gitattributes b/M6502/M6502.Test/roms/.gitattributes
similarity index 100%
rename from Test_M6502/roms/.gitattributes
rename to M6502/M6502.Test/roms/.gitattributes
diff --git a/Test_M6502/roms/.gitignore b/M6502/M6502.Test/roms/.gitignore
similarity index 100%
rename from Test_M6502/roms/.gitignore
rename to M6502/M6502.Test/roms/.gitignore
diff --git a/Test_M6502/roms/6502_decimal_test.a65 b/M6502/M6502.Test/roms/6502_decimal_test.a65
similarity index 100%
rename from Test_M6502/roms/6502_decimal_test.a65
rename to M6502/M6502.Test/roms/6502_decimal_test.a65
diff --git a/Test_M6502/roms/6502_functional_test.a65 b/M6502/M6502.Test/roms/6502_functional_test.a65
similarity index 100%
rename from Test_M6502/roms/6502_functional_test.a65
rename to M6502/M6502.Test/roms/6502_functional_test.a65
diff --git a/Test_M6502/roms/6502_functional_test.bin b/M6502/M6502.Test/roms/6502_functional_test.bin
similarity index 100%
rename from Test_M6502/roms/6502_functional_test.bin
rename to M6502/M6502.Test/roms/6502_functional_test.bin
diff --git a/Test_M6502/roms/6502_interrupt_test.a65 b/M6502/M6502.Test/roms/6502_interrupt_test.a65
similarity index 100%
rename from Test_M6502/roms/6502_interrupt_test.a65
rename to M6502/M6502.Test/roms/6502_interrupt_test.a65
diff --git a/Test_M6502/roms/65C02_extended_opcodes_test.a65c b/M6502/M6502.Test/roms/65C02_extended_opcodes_test.a65c
similarity index 100%
rename from Test_M6502/roms/65C02_extended_opcodes_test.a65c
rename to M6502/M6502.Test/roms/65C02_extended_opcodes_test.a65c
diff --git a/Test_M6502/roms/AllSuiteA.asm b/M6502/M6502.Test/roms/AllSuiteA.asm
similarity index 100%
rename from Test_M6502/roms/AllSuiteA.asm
rename to M6502/M6502.Test/roms/AllSuiteA.asm
diff --git a/Test_M6502/roms/AllSuiteA.bin b/M6502/M6502.Test/roms/AllSuiteA.bin
similarity index 100%
rename from Test_M6502/roms/AllSuiteA.bin
rename to M6502/M6502.Test/roms/AllSuiteA.bin
diff --git a/Test_M6502/roms/license.txt b/M6502/M6502.Test/roms/license.txt
similarity index 100%
rename from Test_M6502/roms/license.txt
rename to M6502/M6502.Test/roms/license.txt
diff --git a/Test_M6502/roms/readme.txt b/M6502/M6502.Test/roms/readme.txt
similarity index 100%
rename from Test_M6502/roms/readme.txt
rename to M6502/M6502.Test/roms/readme.txt
diff --git a/Test_M6502/roms/report.i65 b/M6502/M6502.Test/roms/report.i65
similarity index 100%
rename from Test_M6502/roms/report.i65
rename to M6502/M6502.Test/roms/report.i65
diff --git a/UnitTestEightBit/stylecop.json b/M6502/M6502.Test/stylecop.json
similarity index 100%
rename from UnitTestEightBit/stylecop.json
rename to M6502/M6502.Test/stylecop.json