diff --git a/ImpromptuInterface.sln b/ImpromptuInterface.sln
index 9ba444f..daa18d4 100644
--- a/ImpromptuInterface.sln
+++ b/ImpromptuInterface.sln
@@ -5,14 +5,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImpromptuInterface", "ImpromptuInterface\ImpromptuInterface.csproj", "{DAB7C056-660A-4153-8FF2-B80A41310AD7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestImpromptuInterface", "UnitTestImpromptuInterface\UnitTestImpromptuInterface.csproj", "{A559B4F8-8D9D-4761-B2D2-BB4104760450}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImpromptuInterface (Silverlight)", "ImpromptuInterface.Silverlight\ImpromptuInterface (Silverlight).csproj", "{9181A92F-9A17-45A3-BBDB-EAC085A901A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestImpromptuInterface.Silverlight", "UnitTestImpromputInterface.Silverlight\UnitTestImpromptuInterface.Silverlight.csproj", "{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestImpromptuInterface.SelfRunner", "UnitTestImpromptuInterface.SelfRunner\UnitTestImpromptuInterface.SelfRunner.csproj", "{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImpromptuInterface.MVVM", "ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj", "{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DAB7C056-660A-4153-8FF2-B80A41310AD7} = {DAB7C056-660A-4153-8FF2-B80A41310AD7}
@@ -33,19 +27,25 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetBuild", "NuGetBuild\Nu
 		{56215C8D-85AE-4FCB-BD33-89E6ABBA407B} = {56215C8D-85AE-4FCB-BD33-89E6ABBA407B}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestSupportLibrary", "UnitTestSupportLibrary\UnitTestSupportLibrary.csproj", "{0EC76091-958A-4020-BA6B-39B00EE55659}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ImpromptuInterface.FSharp", "ImpromptuInterface.FSharp\ImpromptuInterface.FSharp.fsproj", "{D4D82191-1F83-43FB-8309-83637D8D11E8}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ImpromptuInterface.FSharp (Silverlight)", "ImpromptuInterface.FSharp.Silverlight\ImpromptuInterface.FSharp (Silverlight).fsproj", "{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestSupportLibrary.Silverlight", "UnitTestSupportLibrary.Silverlight\UnitTestSupportLibrary.Silverlight.csproj", "{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestSupportLibrary", "Tests\UnitTestSupportLibrary\UnitTestSupportLibrary.csproj", "{0EC76091-958A-4020-BA6B-39B00EE55659}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "UnitTestImpromptuInterface.VBNET", "UnitTestImpromptuInterface.VBNet\UnitTestImpromptuInterface.VBNET.vbproj", "{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestSupportLibrary.Silverlight", "Tests\UnitTestSupportLibrary.Silverlight\UnitTestSupportLibrary.Silverlight.csproj", "{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ImpromptuInterface.FSharp", "ImpromptuInterface.FSharp\ImpromptuInterface.FSharp.fsproj", "{D4D82191-1F83-43FB-8309-83637D8D11E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestImpromptuInterface", "Tests\UnitTestImpromptuInterface\UnitTestImpromptuInterface.csproj", "{A559B4F8-8D9D-4761-B2D2-BB4104760450}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UnitTestImpromptuInterface.FSharp", "UnitTestImpromptuInterface.FSharp\UnitTestImpromptuInterface.FSharp.fsproj", "{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestImpromptuInterface.SelfRunner", "Tests\UnitTestImpromptuInterface.SelfRunner\UnitTestImpromptuInterface.SelfRunner.csproj", "{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ImpromptuInterface.FSharp (Silverlight)", "ImpromptuInterface.FSharp.Silverlight\ImpromptuInterface.FSharp (Silverlight).fsproj", "{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UnitTestImpromptu.FSharp.Silverlight", "Tests\UnitTestImpromptu.FSharp.Silverlight\UnitTestImpromptu.FSharp.Silverlight.fsproj", "{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UnitTestImpromptuInterface.FSharp", "Tests\UnitTestImpromptuInterface.FSharp\UnitTestImpromptuInterface.FSharp.fsproj", "{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "UnitTestImpromptuInterface.VBNET", "Tests\UnitTestImpromptuInterface.VBNet\UnitTestImpromptuInterface.VBNET.vbproj", "{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UnitTestImpromptu.FSharp.Silverlight", "UnitTestImpromptu.FSharp.Silverlight\UnitTestImpromptu.FSharp.Silverlight.fsproj", "{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestImpromptuInterface.Silverlight", "Tests\UnitTestImpromputInterface.Silverlight\UnitTestImpromptuInterface.Silverlight.csproj", "{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,16 +67,6 @@ Global
 		{DAB7C056-660A-4153-8FF2-B80A41310AD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DAB7C056-660A-4153-8FF2-B80A41310AD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DAB7C056-660A-4153-8FF2-B80A41310AD7}.Release|x86.ActiveCfg = Release|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|x86.ActiveCfg = Release|Any CPU
 		{9181A92F-9A17-45A3-BBDB-EAC085A901A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9181A92F-9A17-45A3-BBDB-EAC085A901A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9181A92F-9A17-45A3-BBDB-EAC085A901A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -87,26 +77,6 @@ Global
 		{9181A92F-9A17-45A3-BBDB-EAC085A901A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9181A92F-9A17-45A3-BBDB-EAC085A901A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9181A92F-9A17-45A3-BBDB-EAC085A901A0}.Release|x86.ActiveCfg = Release|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|x86.ActiveCfg = Release|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|x86.ActiveCfg = Release|Any CPU
 		{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -137,36 +107,6 @@ Global
 		{114BB5F5-AA44-4932-99E1-328A11F6C497}.Release|Mixed Platforms.Build.0 = Release|x86
 		{114BB5F5-AA44-4932-99E1-328A11F6C497}.Release|x86.ActiveCfg = Release|x86
 		{114BB5F5-AA44-4932-99E1-328A11F6C497}.Release|x86.Build.0 = Release|x86
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|x86.ActiveCfg = Release|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|x86.ActiveCfg = Release|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|x86.ActiveCfg = Release|Any CPU
 		{D4D82191-1F83-43FB-8309-83637D8D11E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4D82191-1F83-43FB-8309-83637D8D11E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4D82191-1F83-43FB-8309-83637D8D11E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -177,16 +117,6 @@ Global
 		{D4D82191-1F83-43FB-8309-83637D8D11E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4D82191-1F83-43FB-8309-83637D8D11E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4D82191-1F83-43FB-8309-83637D8D11E8}.Release|x86.ActiveCfg = Release|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|x86.ActiveCfg = Release|Any CPU
 		{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -197,6 +127,46 @@ Global
 		{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6F699C3-C2C7-4393-B8C2-B5C234ED23D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0EC76091-958A-4020-BA6B-39B00EE55659}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30}.Release|x86.ActiveCfg = Release|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450}.Release|x86.ActiveCfg = Release|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80}.Release|x86.ActiveCfg = Release|Any CPU
 		{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -207,19 +177,49 @@ Global
 		{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6}.Release|x86.ActiveCfg = Release|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A559B4F8-8D9D-4761-B2D2-BB4104760450} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
-		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
-		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
 		{0EC76091-958A-4020-BA6B-39B00EE55659} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
 		{EE860CF5-6707-42F2-8091-3D4DC3ED1D30} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
-		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
-		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
+		{A559B4F8-8D9D-4761-B2D2-BB4104760450} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
+		{0DE22C5D-71F4-4ABF-88B1-842AEAF46A80} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
 		{98BFE093-9CAD-4E97-A0D4-7AAEC320BEF6} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
+		{41DAF279-DFA1-4256-82CF-47F7BE0BEA10} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
+		{9D5436B9-5A2E-49BC-A99A-FB355F099AA9} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
+		{A009FD57-4F7A-43F5-A155-0EE35C0F5FC1} = {983B9C01-EB2E-49E3-BB3E-A3FD41858F8C}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Test\Test.csproj
diff --git a/UnitTestImpromptu.FSharp.Silverlight/FakeUnquote.fs b/Tests/UnitTestImpromptu.FSharp.Silverlight/FakeUnquote.fs
similarity index 100%
rename from UnitTestImpromptu.FSharp.Silverlight/FakeUnquote.fs
rename to Tests/UnitTestImpromptu.FSharp.Silverlight/FakeUnquote.fs
diff --git a/UnitTestImpromptu.FSharp.Silverlight/UnitTestImpromptu.FSharp.Silverlight.fsproj b/Tests/UnitTestImpromptu.FSharp.Silverlight/UnitTestImpromptu.FSharp.Silverlight.fsproj
similarity index 82%
rename from UnitTestImpromptu.FSharp.Silverlight/UnitTestImpromptu.FSharp.Silverlight.fsproj
rename to Tests/UnitTestImpromptu.FSharp.Silverlight/UnitTestImpromptu.FSharp.Silverlight.fsproj
index e85658b..312e4d2 100644
--- a/UnitTestImpromptu.FSharp.Silverlight/UnitTestImpromptu.FSharp.Silverlight.fsproj
+++ b/Tests/UnitTestImpromptu.FSharp.Silverlight/UnitTestImpromptu.FSharp.Silverlight.fsproj
@@ -47,10 +47,15 @@
     <Compile Include="..\UnitTestImpromptuInterface.FSharp\Basic.fs">
       <Link>Basic.fs</Link>
     </Compile>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Castle.Core">
+      <HintPath>..\..\packages\Moq.4.0.10827\lib\Silverlight4\Castle.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp">
-      <HintPath>..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\Microsoft.CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\Microsoft.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Silverlight.Testing">
       <HintPath>..\tools\Silverlight4-NUnit2.5.8-Apr2010\Microsoft.Silverlight.Testing.dll</HintPath>
@@ -58,6 +63,10 @@
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight">
       <HintPath>..\tools\Silverlight4-NUnit2.5.8-Apr2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
     </Reference>
+    <Reference Include="Moq.Silverlight">
+      <HintPath>..\..\packages\Moq.4.0.10827\lib\Silverlight4\Moq.Silverlight.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core">
       <HintPath>$(ProgramFiles)\Microsoft F#\Silverlight\Libraries\Client\$(SilverlightVersion)\FSharp.Core.dll</HintPath>
@@ -75,20 +84,17 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
     <Reference Include="System.Numerics">
-      <HintPath>..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Numerics.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Numerics.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Browser" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <HintPath>..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\ImpromptuInterface.FSharp.Silverlight\ImpromptuInterface.FSharp %28Silverlight%29.fsproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.FSharp.Silverlight\ImpromptuInterface.FSharp %28Silverlight%29.fsproj">
       <Name>ImpromptuInterface.FSharp (Silverlight)</Name>
       <Project>{c6f699c3-c2c7-4393-b8c2-b5c234ed23d7}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
       <Name>ImpromptuInterface (Silverlight)</Name>
       <Project>{9181a92f-9a17-45a3-bbdb-eac085a901a0}</Project>
       <Private>True</Private>
@@ -98,6 +104,9 @@
       <Project>{ee860cf5-6707-42f2-8091-3d4dc3ed1d30}</Project>
       <Private>True</Private>
     </ProjectReference>
+    <Reference Include="System.Xml.Linq">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Xml.Linq.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 	     Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Tests/UnitTestImpromptu.FSharp.Silverlight/packages.config b/Tests/UnitTestImpromptu.FSharp.Silverlight/packages.config
new file mode 100644
index 0000000..e0023a2
--- /dev/null
+++ b/Tests/UnitTestImpromptu.FSharp.Silverlight/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.0.10827" />
+</packages>
\ No newline at end of file
diff --git a/UnitTestImpromptuInterface.FSharp/Basic.fs b/Tests/UnitTestImpromptuInterface.FSharp/Basic.fs
similarity index 100%
rename from UnitTestImpromptuInterface.FSharp/Basic.fs
rename to Tests/UnitTestImpromptuInterface.FSharp/Basic.fs
diff --git a/UnitTestImpromptuInterface.FSharp/UnitTestImpromptuInterface.FSharp.fsproj b/Tests/UnitTestImpromptuInterface.FSharp/UnitTestImpromptuInterface.FSharp.fsproj
similarity index 93%
rename from UnitTestImpromptuInterface.FSharp/UnitTestImpromptuInterface.FSharp.fsproj
rename to Tests/UnitTestImpromptuInterface.FSharp/UnitTestImpromptuInterface.FSharp.fsproj
index 52f4343..1bb9765 100644
--- a/UnitTestImpromptuInterface.FSharp/UnitTestImpromptuInterface.FSharp.fsproj
+++ b/Tests/UnitTestImpromptuInterface.FSharp/UnitTestImpromptuInterface.FSharp.fsproj
@@ -66,12 +66,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.FSharp\ImpromptuInterface.FSharp.fsproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.FSharp\ImpromptuInterface.FSharp.fsproj">
       <Name>ImpromptuInterface.FSharp</Name>
       <Project>{d4d82191-1f83-43fb-8309-83637d8d11e8}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Name>ImpromptuInterface</Name>
       <Project>{dab7c056-660a-4153-8ff2-b80a41310ad7}</Project>
       <Private>True</Private>
diff --git a/UnitTestImpromptuInterface.FSharp/packages.config b/Tests/UnitTestImpromptuInterface.FSharp/packages.config
similarity index 100%
rename from UnitTestImpromptuInterface.FSharp/packages.config
rename to Tests/UnitTestImpromptuInterface.FSharp/packages.config
diff --git a/UnitTestImpromptuInterface.SelfRunner/AssemblyInfo.cs b/Tests/UnitTestImpromptuInterface.SelfRunner/AssemblyInfo.cs
similarity index 100%
rename from UnitTestImpromptuInterface.SelfRunner/AssemblyInfo.cs
rename to Tests/UnitTestImpromptuInterface.SelfRunner/AssemblyInfo.cs
diff --git a/UnitTestImpromptuInterface.SelfRunner/Support/Helper.cs b/Tests/UnitTestImpromptuInterface.SelfRunner/Support/Helper.cs
similarity index 100%
rename from UnitTestImpromptuInterface.SelfRunner/Support/Helper.cs
rename to Tests/UnitTestImpromptuInterface.SelfRunner/Support/Helper.cs
diff --git a/UnitTestImpromptuInterface.SelfRunner/Support/Program.cs b/Tests/UnitTestImpromptuInterface.SelfRunner/Support/Program.cs
similarity index 100%
rename from UnitTestImpromptuInterface.SelfRunner/Support/Program.cs
rename to Tests/UnitTestImpromptuInterface.SelfRunner/Support/Program.cs
diff --git a/UnitTestImpromptuInterface.SelfRunner/UnitTestImpromptuInterface.SelfRunner.csproj b/Tests/UnitTestImpromptuInterface.SelfRunner/UnitTestImpromptuInterface.SelfRunner.csproj
similarity index 95%
rename from UnitTestImpromptuInterface.SelfRunner/UnitTestImpromptuInterface.SelfRunner.csproj
rename to Tests/UnitTestImpromptuInterface.SelfRunner/UnitTestImpromptuInterface.SelfRunner.csproj
index aec1732..167cc5c 100644
--- a/UnitTestImpromptuInterface.SelfRunner/UnitTestImpromptuInterface.SelfRunner.csproj
+++ b/Tests/UnitTestImpromptuInterface.SelfRunner/UnitTestImpromptuInterface.SelfRunner.csproj
@@ -90,7 +90,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Project>{DAB7C056-660A-4153-8FF2-B80A41310AD7}</Project>
       <Name>ImpromptuInterface</Name>
     </ProjectReference>
diff --git a/UnitTestImpromptuInterface.SelfRunner/packages.config b/Tests/UnitTestImpromptuInterface.SelfRunner/packages.config
similarity index 100%
rename from UnitTestImpromptuInterface.SelfRunner/packages.config
rename to Tests/UnitTestImpromptuInterface.SelfRunner/packages.config
diff --git a/UnitTestImpromptuInterface.VBNet/Basic.vb b/Tests/UnitTestImpromptuInterface.VBNet/Basic.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/Basic.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/Basic.vb
diff --git a/UnitTestImpromptuInterface.VBNet/ClayTest.vb b/Tests/UnitTestImpromptuInterface.VBNet/ClayTest.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/ClayTest.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/ClayTest.vb
diff --git a/UnitTestImpromptuInterface.VBNet/Generics.vb b/Tests/UnitTestImpromptuInterface.VBNet/Generics.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/Generics.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/Generics.vb
diff --git a/UnitTestImpromptuInterface.VBNet/ImpromptuDynamic.vb b/Tests/UnitTestImpromptuInterface.VBNet/ImpromptuDynamic.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/ImpromptuDynamic.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/ImpromptuDynamic.vb
diff --git a/UnitTestImpromptuInterface.VBNet/MVVM.vb b/Tests/UnitTestImpromptuInterface.VBNet/MVVM.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/MVVM.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/MVVM.vb
diff --git a/UnitTestImpromptuInterface.VBNet/PrivateTest.vb b/Tests/UnitTestImpromptuInterface.VBNet/PrivateTest.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/PrivateTest.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/PrivateTest.vb
diff --git a/UnitTestImpromptuInterface.VBNet/Serialization.vb b/Tests/UnitTestImpromptuInterface.VBNet/Serialization.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/Serialization.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/Serialization.vb
diff --git a/UnitTestImpromptuInterface.VBNet/SingleMethodInvoke.vb b/Tests/UnitTestImpromptuInterface.VBNet/SingleMethodInvoke.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/SingleMethodInvoke.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/SingleMethodInvoke.vb
diff --git a/UnitTestImpromptuInterface.VBNet/Support/FixtureSetup.vb b/Tests/UnitTestImpromptuInterface.VBNet/Support/FixtureSetup.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/Support/FixtureSetup.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/Support/FixtureSetup.vb
diff --git a/UnitTestImpromptuInterface.VBNet/Support/Helper.vb b/Tests/UnitTestImpromptuInterface.VBNet/Support/Helper.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/Support/Helper.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/Support/Helper.vb
diff --git a/UnitTestImpromptuInterface.VBNet/Support/SupportDefinitions.vb b/Tests/UnitTestImpromptuInterface.VBNet/Support/SupportDefinitions.vb
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/Support/SupportDefinitions.vb
rename to Tests/UnitTestImpromptuInterface.VBNet/Support/SupportDefinitions.vb
diff --git a/UnitTestImpromptuInterface.VBNet/UnitTestImpromptuInterface.VBNET.vbproj b/Tests/UnitTestImpromptuInterface.VBNet/UnitTestImpromptuInterface.VBNET.vbproj
similarity index 95%
rename from UnitTestImpromptuInterface.VBNet/UnitTestImpromptuInterface.VBNET.vbproj
rename to Tests/UnitTestImpromptuInterface.VBNet/UnitTestImpromptuInterface.VBNET.vbproj
index dcd6a2c..94d0479 100644
--- a/UnitTestImpromptuInterface.VBNet/UnitTestImpromptuInterface.VBNET.vbproj
+++ b/Tests/UnitTestImpromptuInterface.VBNet/UnitTestImpromptuInterface.VBNET.vbproj
@@ -96,11 +96,11 @@
     <Compile Include="Support\FixtureSetup.vb" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
       <Project>{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}</Project>
       <Name>ImpromptuInterface.MVVM</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Project>{DAB7C056-660A-4153-8FF2-B80A41310AD7}</Project>
       <Name>ImpromptuInterface</Name>
     </ProjectReference>
diff --git a/UnitTestImpromptuInterface.VBNet/packages.config b/Tests/UnitTestImpromptuInterface.VBNet/packages.config
similarity index 100%
rename from UnitTestImpromptuInterface.VBNet/packages.config
rename to Tests/UnitTestImpromptuInterface.VBNet/packages.config
diff --git a/UnitTestImpromptuInterface/Basic.cs b/Tests/UnitTestImpromptuInterface/Basic.cs
similarity index 100%
rename from UnitTestImpromptuInterface/Basic.cs
rename to Tests/UnitTestImpromptuInterface/Basic.cs
diff --git a/UnitTestImpromptuInterface/ClayTest.cs b/Tests/UnitTestImpromptuInterface/ClayTest.cs
similarity index 100%
rename from UnitTestImpromptuInterface/ClayTest.cs
rename to Tests/UnitTestImpromptuInterface/ClayTest.cs
diff --git a/UnitTestImpromptuInterface/Curry.cs b/Tests/UnitTestImpromptuInterface/Curry.cs
similarity index 100%
rename from UnitTestImpromptuInterface/Curry.cs
rename to Tests/UnitTestImpromptuInterface/Curry.cs
diff --git a/UnitTestImpromptuInterface/Generics.cs b/Tests/UnitTestImpromptuInterface/Generics.cs
similarity index 100%
rename from UnitTestImpromptuInterface/Generics.cs
rename to Tests/UnitTestImpromptuInterface/Generics.cs
diff --git a/UnitTestImpromptuInterface/ImpromptuDynamic.cs b/Tests/UnitTestImpromptuInterface/ImpromptuDynamic.cs
similarity index 100%
rename from UnitTestImpromptuInterface/ImpromptuDynamic.cs
rename to Tests/UnitTestImpromptuInterface/ImpromptuDynamic.cs
diff --git a/UnitTestImpromptuInterface/MVVM.cs b/Tests/UnitTestImpromptuInterface/MVVM.cs
similarity index 100%
rename from UnitTestImpromptuInterface/MVVM.cs
rename to Tests/UnitTestImpromptuInterface/MVVM.cs
diff --git a/UnitTestImpromptuInterface/PrivateTest.cs b/Tests/UnitTestImpromptuInterface/PrivateTest.cs
similarity index 100%
rename from UnitTestImpromptuInterface/PrivateTest.cs
rename to Tests/UnitTestImpromptuInterface/PrivateTest.cs
diff --git a/UnitTestImpromptuInterface/Serialization.cs b/Tests/UnitTestImpromptuInterface/Serialization.cs
similarity index 100%
rename from UnitTestImpromptuInterface/Serialization.cs
rename to Tests/UnitTestImpromptuInterface/Serialization.cs
diff --git a/UnitTestImpromptuInterface/SingleMethodInvoke.cs b/Tests/UnitTestImpromptuInterface/SingleMethodInvoke.cs
similarity index 100%
rename from UnitTestImpromptuInterface/SingleMethodInvoke.cs
rename to Tests/UnitTestImpromptuInterface/SingleMethodInvoke.cs
diff --git a/UnitTestImpromptuInterface/SpeedTest.cs b/Tests/UnitTestImpromptuInterface/SpeedTest.cs
similarity index 100%
rename from UnitTestImpromptuInterface/SpeedTest.cs
rename to Tests/UnitTestImpromptuInterface/SpeedTest.cs
diff --git a/UnitTestImpromptuInterface/Support/FixtureSetup.cs b/Tests/UnitTestImpromptuInterface/Support/FixtureSetup.cs
similarity index 100%
rename from UnitTestImpromptuInterface/Support/FixtureSetup.cs
rename to Tests/UnitTestImpromptuInterface/Support/FixtureSetup.cs
diff --git a/UnitTestImpromptuInterface/Support/Helper.cs b/Tests/UnitTestImpromptuInterface/Support/Helper.cs
similarity index 100%
rename from UnitTestImpromptuInterface/Support/Helper.cs
rename to Tests/UnitTestImpromptuInterface/Support/Helper.cs
diff --git a/UnitTestImpromptuInterface/Support/SupportDefinitions.cs b/Tests/UnitTestImpromptuInterface/Support/SupportDefinitions.cs
similarity index 100%
rename from UnitTestImpromptuInterface/Support/SupportDefinitions.cs
rename to Tests/UnitTestImpromptuInterface/Support/SupportDefinitions.cs
diff --git a/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj b/Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
similarity index 95%
rename from UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
rename to Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
index 10c2816..224690b 100644
--- a/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
+++ b/Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
@@ -94,11 +94,11 @@
     <Compile Include="SingleMethodInvoke.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
       <Project>{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}</Project>
       <Name>ImpromptuInterface.MVVM</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Project>{DAB7C056-660A-4153-8FF2-B80A41310AD7}</Project>
       <Name>ImpromptuInterface</Name>
     </ProjectReference>
diff --git a/UnitTestImpromptuInterface/packages.config b/Tests/UnitTestImpromptuInterface/packages.config
similarity index 100%
rename from UnitTestImpromptuInterface/packages.config
rename to Tests/UnitTestImpromptuInterface/packages.config
diff --git a/UnitTestImpromputInterface.Silverlight/Properties/AssemblyInfo.cs b/Tests/UnitTestImpromputInterface.Silverlight/Properties/AssemblyInfo.cs
similarity index 100%
rename from UnitTestImpromputInterface.Silverlight/Properties/AssemblyInfo.cs
rename to Tests/UnitTestImpromputInterface.Silverlight/Properties/AssemblyInfo.cs
diff --git a/UnitTestImpromputInterface.Silverlight/Support/Helper.cs b/Tests/UnitTestImpromputInterface.Silverlight/Support/Helper.cs
similarity index 100%
rename from UnitTestImpromputInterface.Silverlight/Support/Helper.cs
rename to Tests/UnitTestImpromputInterface.Silverlight/Support/Helper.cs
diff --git a/UnitTestImpromputInterface.Silverlight/UnitTestImpromptuInterface.Silverlight.csproj b/Tests/UnitTestImpromputInterface.Silverlight/UnitTestImpromptuInterface.Silverlight.csproj
similarity index 94%
rename from UnitTestImpromputInterface.Silverlight/UnitTestImpromptuInterface.Silverlight.csproj
rename to Tests/UnitTestImpromputInterface.Silverlight/UnitTestImpromptuInterface.Silverlight.csproj
index 0263e5f..650cdba 100644
--- a/UnitTestImpromputInterface.Silverlight/UnitTestImpromptuInterface.Silverlight.csproj
+++ b/Tests/UnitTestImpromputInterface.Silverlight/UnitTestImpromptuInterface.Silverlight.csproj
@@ -87,7 +87,9 @@
       <HintPath>..\tools\Silverlight4-NUnit2.5.8-Apr2010\NUnit.Silverlight.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Core">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Net" />
     <Reference Include="System.Windows.Browser" />
@@ -148,11 +150,11 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.MVVM.Silverlight\ImpromptuInterface.MVVM %28Silverlight%29.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.MVVM.Silverlight\ImpromptuInterface.MVVM %28Silverlight%29.csproj">
       <Project>{56215C8D-85AE-4FCB-BD33-89E6ABBA407B}</Project>
       <Name>ImpromptuInterface.MVVM %28Silverlight%29</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
       <Project>{9181A92F-9A17-45A3-BBDB-EAC085A901A0}</Project>
       <Name>ImpromptuInterface %28Silverlight%29</Name>
     </ProjectReference>
diff --git a/UnitTestSupportLibrary.Silverlight/Properties/AssemblyInfo.cs b/Tests/UnitTestSupportLibrary.Silverlight/Properties/AssemblyInfo.cs
similarity index 100%
rename from UnitTestSupportLibrary.Silverlight/Properties/AssemblyInfo.cs
rename to Tests/UnitTestSupportLibrary.Silverlight/Properties/AssemblyInfo.cs
diff --git a/UnitTestSupportLibrary.Silverlight/UnitTestSupportLibrary.Silverlight.csproj b/Tests/UnitTestSupportLibrary.Silverlight/UnitTestSupportLibrary.Silverlight.csproj
similarity index 100%
rename from UnitTestSupportLibrary.Silverlight/UnitTestSupportLibrary.Silverlight.csproj
rename to Tests/UnitTestSupportLibrary.Silverlight/UnitTestSupportLibrary.Silverlight.csproj
diff --git a/UnitTestSupportLibrary/ExampleOp.cs b/Tests/UnitTestSupportLibrary/ExampleOp.cs
similarity index 100%
rename from UnitTestSupportLibrary/ExampleOp.cs
rename to Tests/UnitTestSupportLibrary/ExampleOp.cs
diff --git a/UnitTestSupportLibrary/Properties/AssemblyInfo.cs b/Tests/UnitTestSupportLibrary/Properties/AssemblyInfo.cs
similarity index 100%
rename from UnitTestSupportLibrary/Properties/AssemblyInfo.cs
rename to Tests/UnitTestSupportLibrary/Properties/AssemblyInfo.cs
diff --git a/UnitTestSupportLibrary/SupportTypes.cs b/Tests/UnitTestSupportLibrary/SupportTypes.cs
similarity index 100%
rename from UnitTestSupportLibrary/SupportTypes.cs
rename to Tests/UnitTestSupportLibrary/SupportTypes.cs
diff --git a/UnitTestSupportLibrary/UnitTestSupportLibrary.csproj b/Tests/UnitTestSupportLibrary/UnitTestSupportLibrary.csproj
similarity index 100%
rename from UnitTestSupportLibrary/UnitTestSupportLibrary.csproj
rename to Tests/UnitTestSupportLibrary/UnitTestSupportLibrary.csproj