diff --git a/lib/Processing.NDI.Lib.x86.dll b/Costura32/Processing.NDI.Lib.x86.dll
similarity index 100%
rename from lib/Processing.NDI.Lib.x86.dll
rename to Costura32/Processing.NDI.Lib.x86.dll
diff --git a/lib/Processing.NDI.Lib.x64.dll b/Costura64/Processing.NDI.Lib.x64.dll
similarity index 100%
rename from lib/Processing.NDI.Lib.x64.dll
rename to Costura64/Processing.NDI.Lib.x64.dll
diff --git a/FodyWeavers.xml b/FodyWeavers.xml
new file mode 100644
index 0000000..8254571
--- /dev/null
+++ b/FodyWeavers.xml
@@ -0,0 +1,10 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+	<Costura>
+		<Unmanaged32Assemblies>
+			Processing.NDI.Lib.x86
+		</Unmanaged32Assemblies>
+		<Unmanaged64Assemblies>
+			Processing.NDI.Lib.x64
+		</Unmanaged64Assemblies>
+	</Costura>
+</Weavers>
\ No newline at end of file
diff --git a/NDI Telestrator.csproj b/NDI Telestrator.csproj
index 292f03b..d4f0341 100644
--- a/NDI Telestrator.csproj	
+++ b/NDI Telestrator.csproj	
@@ -45,18 +45,17 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject>NDI_Telestrator.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -165,16 +164,10 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ContentWithTargetPath Include="lib\Processing.NDI.Lib.x64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>Processing.NDI.Lib.x64.dll</TargetPath>
-    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="lib\Processing.NDI.Lib.x86.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>Processing.NDI.Lib.x86.dll</TargetPath>
-    </ContentWithTargetPath>
-  </ItemGroup>
-  <ItemGroup>
+    <PackageReference Include="Costura.Fody">
+      <Version>5.7.0</Version>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="MahApps.Metro">
       <Version>2.4.5</Version>
     </PackageReference>
@@ -192,5 +185,13 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Costura32\Processing.NDI.Lib.x86.dll" />
+    <EmbeddedResource Include="Costura64\Processing.NDI.Lib.x64.dll" />
+    <Resource Include="FodyWeavers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="lib\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file