diff --git a/Touch.Client/Directory.Build.props b/Touch.Client/Directory.Build.props
deleted file mode 100644
index 7ecd981..0000000
--- a/Touch.Client/Directory.Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>obj\$(_PlatformName)\</BaseIntermediateOutputPath>
-    <OutputPath>bin\$(_PlatformName)\$(Configuration)</OutputPath>
-  </PropertyGroup>
-
-</Project>
diff --git a/Touch.Client/Touch.Client-iOS.dotnet.csproj b/Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj
similarity index 100%
rename from Touch.Client/Touch.Client-iOS.dotnet.csproj
rename to Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj
diff --git a/Touch.Client/Touch.Client-tvOS.dotnet.csproj b/Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj
similarity index 100%
rename from Touch.Client/Touch.Client-tvOS.dotnet.csproj
rename to Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj
diff --git a/Touch.Client/Touch.Client-iOS.csproj b/Touch.Client/iOS/Touch.Client-iOS.csproj
similarity index 73%
rename from Touch.Client/Touch.Client-iOS.csproj
rename to Touch.Client/iOS/Touch.Client-iOS.csproj
index 5e543af..032c217 100644
--- a/Touch.Client/Touch.Client-iOS.csproj
+++ b/Touch.Client/iOS/Touch.Client-iOS.csproj
@@ -12,21 +12,21 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>Touch.Client</AssemblyName>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <BaseIntermediateOutputPath>obj\iOS</BaseIntermediateOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug</OutputPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\iOS\Debug</OutputPath>
     <DefineConstants>DEBUG;NUNITLITE_NUGET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release</OutputPath>
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\iOS\Release</OutputPath>
+    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchVerbosity></MtouchVerbosity>
@@ -41,40 +41,40 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\NUnitLite\TouchRunner\HttpTextWriter.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
       <Link>HttpTextWriter.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
       <Link>NUnitOutputTextWriter.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\Options.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
       <Link>Options.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TcpTextWriter.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
       <Link>TcpTextWriter.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestCaseElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
       <Link>TestCaseElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestElement.cs">
       <Link>TestElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestResultElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestResultElement.cs">
       <Link>TestResultElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestRocks.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
       <Link>TestRocks.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestSuiteElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
       <Link>TestSuiteElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TouchOptions.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
       <Link>TouchOptions.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TouchRunner.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
       <Link>TouchRunner.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TouchViewController.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchViewController.cs">
       <Link>TouchViewController.cs</Link>
     </Compile>
   </ItemGroup>
diff --git a/Touch.Client/Touch.Client-tvOS.csproj b/Touch.Client/tvOS/Touch.Client-tvOS.csproj
similarity index 73%
rename from Touch.Client/Touch.Client-tvOS.csproj
rename to Touch.Client/tvOS/Touch.Client-tvOS.csproj
index 875424c..399c47f 100644
--- a/Touch.Client/Touch.Client-tvOS.csproj
+++ b/Touch.Client/tvOS/Touch.Client-tvOS.csproj
@@ -12,21 +12,21 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>Touch.Client</AssemblyName>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <BaseIntermediateOutputPath>obj\tvOS</BaseIntermediateOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug</OutputPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\tvOS\Debug</OutputPath>
     <DefineConstants>DEBUG;NUNITLITE_NUGET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release</OutputPath>
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\tvOS\Release</OutputPath>
+    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchVerbosity></MtouchVerbosity>
@@ -41,40 +41,40 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\NUnitLite\TouchRunner\HttpTextWriter.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
       <Link>HttpTextWriter.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
       <Link>NUnitOutputTextWriter.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\Options.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
       <Link>Options.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TcpTextWriter.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
       <Link>TcpTextWriter.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestCaseElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
       <Link>TestCaseElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestElement.cs">
       <Link>TestElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestResultElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestResultElement.cs">
       <Link>TestResultElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestRocks.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
       <Link>TestRocks.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TestSuiteElement.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
       <Link>TestSuiteElement.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TouchOptions.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
       <Link>TouchOptions.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TouchRunner.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
       <Link>TouchRunner.cs</Link>
     </Compile>
-    <Compile Include="..\NUnitLite\TouchRunner\TouchViewController.cs">
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchViewController.cs">
       <Link>TouchViewController.cs</Link>
     </Compile>
   </ItemGroup>
diff --git a/Touch.Client/watchOS/Touch.Client-watchOS.csproj b/Touch.Client/watchOS/Touch.Client-watchOS.csproj
new file mode 100644
index 0000000..05d8356
--- /dev/null
+++ b/Touch.Client/watchOS/Touch.Client-watchOS.csproj
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}</ProjectGuid>
+    <ProjectTypeGuids>{FC940695-DFE0-4552-9F25-99AF4A5619A1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Touch.Client</RootNamespace>
+    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
+    <AssemblyName>Touch.Client</AssemblyName>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;NUNITLITE_NUGET</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release</OutputPath>
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <MtouchVerbosity></MtouchVerbosity>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.WatchOS" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
+      <Link>HttpTextWriter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
+      <Link>NUnitOutputTextWriter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
+      <Link>Options.cs</Link>
+    </Compile>
+    <Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
+      <Link>TcpTextWriter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
+      <Link>TestRocks.cs</Link>
+    </Compile>
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
+      <Link>TouchOptions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
+      <Link>TouchRunner.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnitLite">
+      <Version>3.12.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
+      <Version>3.6.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Touch.Unit.sln b/Touch.Unit.sln
index 7097afa..ab97a2a 100644
--- a/Touch.Unit.sln
+++ b/Touch.Unit.sln
@@ -8,9 +8,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monotouch.tests", "monotouc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Server", "Touch.Server\Touch.Server.csproj", "{A1303AE1-2693-4DF7-A17B-20C2ABA1E2ED}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-tvOS", "Touch.Client\Touch.Client-tvOS.csproj", "{A571BB52-F57E-4ED0-ADC0-95656E866C18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-tvOS", "Touch.Client\tvOS\Touch.Client-tvOS.csproj", "{A571BB52-F57E-4ED0-ADC0-95656E866C18}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-iOS", "Touch.Client\Touch.Client-iOS.csproj", "{F611ED96-54B5-4975-99BB-12F50AF95936}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-iOS", "Touch.Client\iOS\Touch.Client-iOS.csproj", "{F611ED96-54B5-4975-99BB-12F50AF95936}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-watchOS", "Touch.Client\watchOS\Touch.Client-watchOS.csproj", "{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -120,6 +122,22 @@ Global
 		{F611ED96-54B5-4975-99BB-12F50AF95936}.AdHoc|iPhone.Build.0 = Debug|Any CPU
 		{F611ED96-54B5-4975-99BB-12F50AF95936}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
 		{F611ED96-54B5-4975-99BB-12F50AF95936}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhone.Build.0 = Release|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhone.ActiveCfg = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhone.Build.0 = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhone.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Touch.Unit.csproj