diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
index 67f8ea0..3f0e003 100644
--- a/.nuget/NuGet.Config
+++ b/.nuget/NuGet.Config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
deleted file mode 100644
index 19efb10..0000000
Binary files a/.nuget/NuGet.exe and /dev/null differ
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
deleted file mode 100644
index 3f8c37b..0000000
--- a/.nuget/NuGet.targets
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
-        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
-      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)"
-              Condition=" '$(OS)' != 'Windows_NT' " />
-
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>
diff --git a/Build.ps1 b/Build.ps1
deleted file mode 100644
index eb01f52..0000000
--- a/Build.ps1
+++ /dev/null
@@ -1,33 +0,0 @@
-Set-StrictMode -version Latest
-$ErrorActionPreference = "Stop"
-
-Write-Host "Building SikuliSharp..." -ForegroundColor Green
-
-# ==================================== Functions
-
-Function GetMSBuildExe {
-	Return "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
-}
-
-# ==================================== Variables
-
-$NuGet = "$PSScriptRoot\.nuget\NuGet.exe"
-$BuildPath = "$PSScriptRoot\SikuliSharp\bin\Release"
-$CSProjPath = "$PSScriptRoot\SikuliSharp\SikuliSharp.csproj"
-
-# ==================================== Build
-
-If(Test-Path -Path $BuildPath) {
-	Remove-Item -Confirm:$false "$BuildPath\*.*" -Recurse
-}
-
-&(GetMSBuildExe) SikuliSharp.sln `
-	/t:Clean`;Rebuild `
-	/p:Configuration=Release `
-	/p:AllowedReferenceRelatedFileExtensions=- `
-	/p:DebugSymbols=false `
-	/p:DebugType=None `
-	/clp:ErrorsOnly `
-	/v:m
-
-&($NuGet) pack $CSProjPath -Prop Configuration=Release
diff --git a/SikuliSharp.TestApplication/Properties/AssemblyInfo.cs b/SikuliSharp.TestApplication/Properties/AssemblyInfo.cs
index 7b6ed1c..e053f76 100644
--- a/SikuliSharp.TestApplication/Properties/AssemblyInfo.cs
+++ b/SikuliSharp.TestApplication/Properties/AssemblyInfo.cs
@@ -1,25 +1,9 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
+using System.Windows;
 using System.Windows.Media;
 
-[assembly: AssemblyTitle("SikuliSharp.TestApplication")]
-[assembly: AssemblyDescription("A C# Wrapper for Sikuli")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Christian Rondeau")]
-[assembly: AssemblyProduct("SikuliSharp")]
-[assembly: AssemblyCopyright("Copyright © Christian Rondeau 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
 [assembly: DisableDpiAwareness]
 
 [assembly: ThemeInfo(
 	ResourceDictionaryLocation.None,
 	ResourceDictionaryLocation.SourceAssembly
 )]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SikuliSharp.TestApplication/SikuliSharp.TestApplication.csproj b/SikuliSharp.TestApplication/SikuliSharp.TestApplication.csproj
index 9a6761e..6688b6b 100644
--- a/SikuliSharp.TestApplication/SikuliSharp.TestApplication.csproj
+++ b/SikuliSharp.TestApplication/SikuliSharp.TestApplication.csproj
@@ -1,100 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="MSBuild.Sdk.Extras/1.6.65">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1A2846ED-8C3B-4391-85A1-D5889F4D6C58}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SikuliSharp.TestApplication</RootNamespace>
-    <AssemblyName>SikuliSharp.TestApplication</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net451</TargetFramework>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <AssemblyTitle>SikuliSharp.TestApplication</AssemblyTitle>
+    <Company>Christian Rondeau</Company>
+    <Product>SikuliSharp</Product>
+    <Description>A C# Wrapper for Sikuli</Description>
+    <Copyright>Copyright © Christian Rondeau 2015</Copyright>
+    <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
+		<IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
   </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/SikuliSharp.Tests/Properties/AssemblyInfo.cs b/SikuliSharp.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index d22288b..0000000
--- a/SikuliSharp.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("SikuliSharp.Tests")]
-[assembly: AssemblyDescription("A C# Wrapper for Sikuli")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Christian Rondeau")]
-[assembly: AssemblyProduct("SikuliSharp")]
-[assembly: AssemblyCopyright("Copyright © Christian Rondeau 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("1678bdd5-c04e-43d5-b16d-6902ff91090a")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SikuliSharp.Tests/SikuliSharp.Tests.csproj b/SikuliSharp.Tests/SikuliSharp.Tests.csproj
index 8633133..644f2db 100644
--- a/SikuliSharp.Tests/SikuliSharp.Tests.csproj
+++ b/SikuliSharp.Tests/SikuliSharp.Tests.csproj
@@ -1,73 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2885B0E4-3876-441B-AC9D-95B597471743}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SikuliSharp.Tests</RootNamespace>
-    <AssemblyName>SikuliSharp.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net451</TargetFramework>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+    <AssemblyTitle>SikuliSharp.Tests</AssemblyTitle>
+    <Company>Christian Rondeau</Company>
+    <Product>SikuliSharp</Product>
+    <Description>A C# Wrapper for Sikuli</Description>
+    <Copyright>Copyright © Christian Rondeau 2019</Copyright>
+		<IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="NSubstitute, Version=1.9.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <HintPath>..\packages\NSubstitute.1.9.2.0\lib\net45\NSubstitute.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EndToEndTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Unit\SikuliScriptProcessFactoryTests.cs" />
-    <Compile Include="Unit\WithOffsetPatternTests.cs" />
-    <Compile Include="Utils\ResourcesUtil.cs" />
-    <Compile Include="Unit\AsyncTwoWayStreamsHandlerFactoryTests.cs" />
-    <Compile Include="Unit\AsyncTwoWayStreamsHandlerTests.cs" />
-    <Compile Include="Utils\BlockingStream.cs" />
-    <Compile Include="Unit\FilePatternTests.cs" />
-    <Compile Include="Unit\PatternsTests.cs" />
-    <Compile Include="Unit\SikuliSessionTests.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="NSubstitute" Version="1.9.2.0" />
+    <PackageReference Include="NUnit" Version="2.6.4" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SikuliSharp.TestApplication\SikuliSharp.TestApplication.csproj">
-      <Project>{1a2846ed-8c3b-4391-85a1-d5889f4d6c58}</Project>
-      <Name>SikuliSharp.TestApplication</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SikuliSharp\SikuliSharp.csproj">
-      <Project>{A4DB5054-B4A1-4DCD-AFC6-91EFE9C25135}</Project>
-      <Name>SikuliSharp</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\SikuliSharp.TestApplication\SikuliSharp.TestApplication.csproj" />
+    <ProjectReference Include="..\SikuliSharp\SikuliSharp.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Data.sikuli\BlackOffsetLabel.png">
@@ -95,19 +43,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/SikuliSharp.Tests/packages.config b/SikuliSharp.Tests/packages.config
deleted file mode 100644
index 00a9b9c..0000000
--- a/SikuliSharp.Tests/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NSubstitute" version="1.9.2.0" targetFramework="net45" />
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/SikuliSharp.sln b/SikuliSharp.sln
index ac7041d..ad02dac 100644
--- a/SikuliSharp.sln
+++ b/SikuliSharp.sln
@@ -1,20 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.329
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SikuliSharp", "SikuliSharp\SikuliSharp.csproj", "{A4DB5054-B4A1-4DCD-AFC6-91EFE9C25135}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SikuliSharp", "SikuliSharp\SikuliSharp.csproj", "{A4DB5054-B4A1-4DCD-AFC6-91EFE9C25135}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SikuliSharp.Tests", "SikuliSharp.Tests\SikuliSharp.Tests.csproj", "{2885B0E4-3876-441B-AC9D-95B597471743}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SikuliSharp.Tests", "SikuliSharp.Tests\SikuliSharp.Tests.csproj", "{2885B0E4-3876-441B-AC9D-95B597471743}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SikuliSharp.TestApplication", "SikuliSharp.TestApplication\SikuliSharp.TestApplication.csproj", "{1A2846ED-8C3B-4391-85A1-D5889F4D6C58}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{41618D63-8D96-4BCF-A7DC-D099C084F961}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SikuliSharp.TestApplication", "SikuliSharp.TestApplication\SikuliSharp.TestApplication.csproj", "{1A2846ED-8C3B-4391-85A1-D5889F4D6C58}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{26DFFB58-AF2E-47E9-9C6F-C84DCCE4991B}"
 	ProjectSection(SolutionItems) = preProject
@@ -44,4 +37,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {33272092-2CF5-47DF-B1D6-5113E01C02F2}
+	EndGlobalSection
 EndGlobal
diff --git a/SikuliSharp/Properties/AssemblyInfo.cs b/SikuliSharp/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4f917bf..0000000
--- a/SikuliSharp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("SikuliSharp")]
-[assembly: AssemblyDescription("A C# Wrapper for Sikuli")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Christian Rondeau")]
-[assembly: AssemblyProduct("SikuliSharp")]
-[assembly: AssemblyCopyright("Copyright © Christian Rondeau 2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("1678bdd5-c04e-43d5-b16d-6902ff91090a")]
-
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0.0")]
diff --git a/SikuliSharp/SikuliSharp.csproj b/SikuliSharp/SikuliSharp.csproj
index 3c3c2d7..24b9a36 100644
--- a/SikuliSharp/SikuliSharp.csproj
+++ b/SikuliSharp/SikuliSharp.csproj
@@ -1,63 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A4DB5054-B4A1-4DCD-AFC6-91EFE9C25135}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SikuliSharp</RootNamespace>
-    <AssemblyName>SikuliSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net451</TargetFramework>
+    <AssemblyTitle>SikuliSharp</AssemblyTitle>
+    <Company>Christian Rondeau</Company>
+    <Product>SikuliSharp</Product>
+    <Description>A fast and simple Sikuli wrapper for .Net</Description>
+    <Copyright>Copyright Christian Rondeau 2019</Copyright>
+    <Version>1.5.0</Version>
+    <AssemblyVersion>1.5.0.0</AssemblyVersion>
+    <FileVersion>1.5.0.0</FileVersion>
+    <Authors>christian.rondeau</Authors>
+		<IsPackable>true</IsPackable>
+    <PackageIconUrl>https://raw.githubusercontent.com/christianrondeau/SikuliSharp/master/Assets/Nuget.Icon.png</PackageIconUrl>
+    <PackageId>SikuliSharp</PackageId>
+    <PackageProjectUrl>https://github.com/christianrondeau/SikuliSharp</PackageProjectUrl>
+    <PackageReleaseNotes>Sikuli 1.1.4 support, Find, Highlight</PackageReleaseNotes>
+    <PackageTags>sikuli automation unit test functional automated</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AsyncTwoWayStreamsHandler.cs" />
-    <Compile Include="Match.cs" />
-    <Compile Include="Patterns.cs" />
-    <Compile Include="Point.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Region.cs" />
-    <Compile Include="Sikuli.cs" />
-    <Compile Include="SikuliException.cs" />
-    <Compile Include="SikuliFindFailedException.cs" />
-    <Compile Include="SikuliVersion.cs" />
-    <Compile Include="SikuliScriptProcessFactory.cs" />
-    <Compile Include="SikuliRuntime.cs" />
-    <Compile Include="SikuliSession.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="SikuliSharp.nuspec" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/SikuliSharp/SikuliSharp.nuspec b/SikuliSharp/SikuliSharp.nuspec
deleted file mode 100644
index ad4a7cc..0000000
--- a/SikuliSharp/SikuliSharp.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>SikuliSharp</id>
-    <version>1.5.0</version>
-    <title>SikuliSharp</title>
-    <authors>christian.rondeau</authors>
-    <owners>christian.rondeau</owners>
-    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/christianrondeau/SikuliSharp</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/christianrondeau/SikuliSharp/master/Assets/Nuget.Icon.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>A fast and simple Sikuli wrapper for .Net</description>
-    <summary>Uses the Sikuli interactive console for faster results; you can run commands, or run a .sikuli project. Requires to have Java and Sikuli installed.</summary>
-    <releaseNotes>Sikuli 1.1.4 support, Find, Highlight</releaseNotes>
-    <copyright>Copyright Christian Rondeau 2019</copyright>
-    <tags>sikuli automation unit test functional automated</tags>
-  </metadata>
-</package>