18 files changed, 27 insertions, 11 deletions
diff --git a/Noddybox.Emulation.sln b/Noddybox.Emulation.Phone.sln
index 7578ca2..dce912f 100644
--- a/Noddybox.Emulation.sln
+++ b/Noddybox.Emulation.Phone.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010 Express for Windows Phone
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation", "Noddybox.Emulation\Noddybox.Emulation.csproj", "{A2478066-4DFD-4042-BF98-963922DC97F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation", "WindowsPhone\Noddybox.Emulation\Noddybox.Emulation.csproj", "{A2478066-4DFD-4042-BF98-963922DC97F8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.EightBit", "Noddybox.Emulation.EightBit\Noddybox.Emulation.EightBit.csproj", "{ADC7A871-4DED-4A92-A447-2D784AB60FAF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.EightBit", "WindowsPhone\Noddybox.Emulation.EightBit\Noddybox.Emulation.EightBit.csproj", "{ADC7A871-4DED-4A92-A447-2D784AB60FAF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.EightBit.Z80", "Noddybox.Emulation.EightBit.Z80\Noddybox.Emulation.EightBit.Z80.csproj", "{7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.EightBit.Z80", "WindowsPhone\Noddybox.Emulation.EightBit.Z80\Noddybox.Emulation.EightBit.Z80.csproj", "{7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Noddybox.Emulation.Phone.suo b/Noddybox.Emulation.Phone.suo
new file mode 100644
index 0000000..0e0dc15
--- /dev/null
+++ b/Noddybox.Emulation.Phone.suo
diff --git a/Noddybox.Emulation.suo b/Noddybox.Emulation.suo
deleted file mode 100644
index e96b21c..0000000
--- a/Noddybox.Emulation.suo
+++ /dev/null
diff --git a/Noddybox.Emulation.EightBit.Z80/Noddybox.Emulation.EightBit.Z80.csproj b/WindowsPhone/Noddybox.Emulation.EightBit.Z80/Noddybox.Emulation.EightBit.Z80.csproj
index 03c8010..1e0579f 100644
--- a/Noddybox.Emulation.EightBit.Z80/Noddybox.Emulation.EightBit.Z80.csproj
+++ b/WindowsPhone/Noddybox.Emulation.EightBit.Z80/Noddybox.Emulation.EightBit.Z80.csproj
@@ -49,9 +49,13 @@
     <Reference Include="mscorlib.extensions" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Z80Cpu.cs" />
+    <Compile Include="..\..\src\Noddybox.Emulation.EightBit.Z80\Z80Cpu.cs">
+      <Link>Z80Cpu.cs</Link>
+    </Compile>
+    <Compile Include="..\..\src\Noddybox.Emulation.EightBit.Z80\Z80CpuBaseOpcodes.cs">
+      <Link>Z80CpuBaseOpcodes.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Z80CpuBaseOpcodes.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Noddybox.Emulation.EightBit\Noddybox.Emulation.EightBit.csproj">
diff --git a/Noddybox.Emulation.EightBit.Z80/Properties/AssemblyInfo.cs b/WindowsPhone/Noddybox.Emulation.EightBit.Z80/Properties/AssemblyInfo.cs
index 52b6054..52b6054 100644
--- a/Noddybox.Emulation.EightBit.Z80/Properties/AssemblyInfo.cs
+++ b/WindowsPhone/Noddybox.Emulation.EightBit.Z80/Properties/AssemblyInfo.cs
diff --git a/Noddybox.Emulation.EightBit/Noddybox.Emulation.EightBit.csproj b/WindowsPhone/Noddybox.Emulation.EightBit/Noddybox.Emulation.EightBit.csproj
index 2136f3c..8d37cd9 100644
--- a/Noddybox.Emulation.EightBit/Noddybox.Emulation.EightBit.csproj
+++ b/WindowsPhone/Noddybox.Emulation.EightBit/Noddybox.Emulation.EightBit.csproj
@@ -49,12 +49,22 @@
     <Reference Include="mscorlib.extensions" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Binary.cs" />
-    <Compile Include="ICpu.cs" />
-    <Compile Include="IDevice.cs" />
-    <Compile Include="IMemory.cs" />
+    <Compile Include="..\..\src\Noddybox.Emulation.EightBit\Binary.cs">
+      <Link>Binary.cs</Link>
+    </Compile>
+    <Compile Include="..\..\src\Noddybox.Emulation.EightBit\ICpu.cs">
+      <Link>ICpu.cs</Link>
+    </Compile>
+    <Compile Include="..\..\src\Noddybox.Emulation.EightBit\IDevice.cs">
+      <Link>IDevice.cs</Link>
+    </Compile>
+    <Compile Include="..\..\src\Noddybox.Emulation.EightBit\IMemory.cs">
+      <Link>IMemory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\src\Noddybox.Emulation.EightBit\Register16.cs">
+      <Link>Register16.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Register16.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Noddybox.Emulation\Noddybox.Emulation.csproj">
diff --git a/Noddybox.Emulation.EightBit/Properties/AssemblyInfo.cs b/WindowsPhone/Noddybox.Emulation.EightBit/Properties/AssemblyInfo.cs
index a0de499..a0de499 100644
--- a/Noddybox.Emulation.EightBit/Properties/AssemblyInfo.cs
+++ b/WindowsPhone/Noddybox.Emulation.EightBit/Properties/AssemblyInfo.cs
diff --git a/Noddybox.Emulation/Noddybox.Emulation.csproj b/WindowsPhone/Noddybox.Emulation/Noddybox.Emulation.csproj
index 040aa44..c245f3b 100644
--- a/Noddybox.Emulation/Noddybox.Emulation.csproj
+++ b/WindowsPhone/Noddybox.Emulation/Noddybox.Emulation.csproj
@@ -49,7 +49,9 @@
     <Reference Include="mscorlib.extensions" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Clock.cs" />
+    <Compile Include="..\..\src\Noddybox.Emulation\Clock.cs">
+      <Link>Clock.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
diff --git a/Noddybox.Emulation/Noddybox.Emulation.suo b/WindowsPhone/Noddybox.Emulation/Noddybox.Emulation.suo
index 0f14302..0f14302 100644
--- a/Noddybox.Emulation/Noddybox.Emulation.suo
+++ b/WindowsPhone/Noddybox.Emulation/Noddybox.Emulation.suo
diff --git a/Noddybox.Emulation/Properties/AssemblyInfo.cs b/WindowsPhone/Noddybox.Emulation/Properties/AssemblyInfo.cs
index d5a5343..d5a5343 100644
--- a/Noddybox.Emulation/Properties/AssemblyInfo.cs
+++ b/WindowsPhone/Noddybox.Emulation/Properties/AssemblyInfo.cs
diff --git a/Noddybox.Emulation.EightBit.Z80/Z80Cpu.cs b/src/Noddybox.Emulation.EightBit.Z80/Z80Cpu.cs
index 5c40854..5c40854 100644
--- a/Noddybox.Emulation.EightBit.Z80/Z80Cpu.cs
+++ b/src/Noddybox.Emulation.EightBit.Z80/Z80Cpu.cs
diff --git a/Noddybox.Emulation.EightBit.Z80/Z80CpuBaseOpcodes.cs b/src/Noddybox.Emulation.EightBit.Z80/Z80CpuBaseOpcodes.cs
index 40b31ca..40b31ca 100644
--- a/Noddybox.Emulation.EightBit.Z80/Z80CpuBaseOpcodes.cs
+++ b/src/Noddybox.Emulation.EightBit.Z80/Z80CpuBaseOpcodes.cs
diff --git a/Noddybox.Emulation.EightBit/Binary.cs b/src/Noddybox.Emulation.EightBit/Binary.cs
index 0b1928b..0b1928b 100644
--- a/Noddybox.Emulation.EightBit/Binary.cs
+++ b/src/Noddybox.Emulation.EightBit/Binary.cs
diff --git a/Noddybox.Emulation.EightBit/ICpu.cs b/src/Noddybox.Emulation.EightBit/ICpu.cs
index dc2f811..dc2f811 100644
--- a/Noddybox.Emulation.EightBit/ICpu.cs
+++ b/src/Noddybox.Emulation.EightBit/ICpu.cs
diff --git a/Noddybox.Emulation.EightBit/IDevice.cs b/src/Noddybox.Emulation.EightBit/IDevice.cs
index b8d234a..b8d234a 100644
--- a/Noddybox.Emulation.EightBit/IDevice.cs
+++ b/src/Noddybox.Emulation.EightBit/IDevice.cs
diff --git a/Noddybox.Emulation.EightBit/IMemory.cs b/src/Noddybox.Emulation.EightBit/IMemory.cs
index 2aa63d9..2aa63d9 100644
--- a/Noddybox.Emulation.EightBit/IMemory.cs
+++ b/src/Noddybox.Emulation.EightBit/IMemory.cs
diff --git a/Noddybox.Emulation.EightBit/Register16.cs b/src/Noddybox.Emulation.EightBit/Register16.cs
index 06c9c01..06c9c01 100644
--- a/Noddybox.Emulation.EightBit/Register16.cs
+++ b/src/Noddybox.Emulation.EightBit/Register16.cs
diff --git a/Noddybox.Emulation/Clock.cs b/src/Noddybox.Emulation/Clock.cs
index 0b733cb..0b733cb 100644
--- a/Noddybox.Emulation/Clock.cs
+++ b/src/Noddybox.Emulation/Clock.cs