diff --git a/pc/CODEC2 GUI/CODEC2 GUI/FreeDV.csproj b/pc/CODEC2 GUI/CODEC2 GUI/FreeDV.csproj
index 35a5a41..14b1db5 100644
--- a/pc/CODEC2 GUI/CODEC2 GUI/FreeDV.csproj	
+++ b/pc/CODEC2 GUI/CODEC2 GUI/FreeDV.csproj	
@@ -49,6 +49,18 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Flex.UiWpfFramework, Version=1.0.1.19540, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\Flex.UiWpfFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="FlexLib, Version=1.5.1.25306, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\FlexLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -59,6 +71,14 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="Util, Version=1.0.1.19540, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\Util.dll</HintPath>
+    </Reference>
+    <Reference Include="Vita, Version=1.0.1.19540, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\Vita.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Form1.cs">
@@ -92,16 +112,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\smartsdr-win\FlexLib\FlexLib.csproj">
-      <Project>{7927817C-D5EF-4A9E-B38E-29668F308343}</Project>
-      <Name>FlexLib</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\smartsdr-win\UiWpfFramework\UiWpfFramework.csproj">
-      <Project>{9C0AD871-92FD-461B-84FF-3738D701814F}</Project>
-      <Name>UiWpfFramework</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
       <Visible>False</Visible>
diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Libs/Flex.UiWpfFramework.dll b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Flex.UiWpfFramework.dll
new file mode 100644
index 0000000..e009e05
Binary files /dev/null and b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Flex.UiWpfFramework.dll differ
diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Libs/FlexLib.dll b/pc/CODEC2 GUI/CODEC2 GUI/Libs/FlexLib.dll
new file mode 100644
index 0000000..f8202da
Binary files /dev/null and b/pc/CODEC2 GUI/CODEC2 GUI/Libs/FlexLib.dll differ
diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Libs/Ionic.Zip.dll b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Ionic.Zip.dll
new file mode 100644
index 0000000..95fa928
Binary files /dev/null and b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Ionic.Zip.dll differ
diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Libs/Util.dll b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Util.dll
new file mode 100644
index 0000000..22e961c
Binary files /dev/null and b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Util.dll differ
diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Libs/Vita.dll b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Vita.dll
new file mode 100644
index 0000000..36e9d6b
Binary files /dev/null and b/pc/CODEC2 GUI/CODEC2 GUI/Libs/Vita.dll differ
diff --git a/pc/CODEC2 GUI/FreeDV.sln b/pc/CODEC2 GUI/FreeDV.sln
index 38f1042..0fa21fa 100644
--- a/pc/CODEC2 GUI/FreeDV.sln	
+++ b/pc/CODEC2 GUI/FreeDV.sln	
@@ -3,14 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeDV", "CODEC2 GUI\FreeDV.csproj", "{51F7B7D3-E411-4E6B-86A2-B4290DBFF89E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlexLib", "..\..\..\smartsdr-win\FlexLib\FlexLib.csproj", "{7927817C-D5EF-4A9E-B38E-29668F308343}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UiWpfFramework", "..\..\..\smartsdr-win\UiWpfFramework\UiWpfFramework.csproj", "{9C0AD871-92FD-461B-84FF-3738D701814F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util", "..\..\..\smartsdr-win\Util\Util.csproj", "{38935DC9-FF48-470C-B876-473A3AE8BD32}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vita", "..\..\..\smartsdr-win\Vita\Vita.csproj", "{6ED364FB-7444-44DA-9196-1D8679425B3E}"
-EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CODEC2_GUI_INSTALLER", "CODEC2_GUI_INSTALLER\CODEC2_GUI_INSTALLER.vdproj", "{AABE6A3C-F038-4448-981F-F68A6D5069C3}"
 EndProject
 Global
@@ -29,38 +21,6 @@ Global
 		{51F7B7D3-E411-4E6B-86A2-B4290DBFF89E}.Release|Any CPU.Build.0 = Release|x86
 		{51F7B7D3-E411-4E6B-86A2-B4290DBFF89E}.Release|x86.ActiveCfg = Release|x86
 		{51F7B7D3-E411-4E6B-86A2-B4290DBFF89E}.Release|x86.Build.0 = Release|x86
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|x86.ActiveCfg = Debug|x86
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Debug|x86.Build.0 = Debug|x86
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Release|x86.ActiveCfg = Release|x86
-		{7927817C-D5EF-4A9E-B38E-29668F308343}.Release|x86.Build.0 = Release|x86
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|x86.ActiveCfg = Debug|x86
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Debug|x86.Build.0 = Debug|x86
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Release|x86.ActiveCfg = Release|x86
-		{9C0AD871-92FD-461B-84FF-3738D701814F}.Release|x86.Build.0 = Release|x86
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|x86.ActiveCfg = Debug|x86
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Debug|x86.Build.0 = Debug|x86
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|Any CPU.Build.0 = Release|Any CPU
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|x86.ActiveCfg = Release|x86
-		{38935DC9-FF48-470C-B876-473A3AE8BD32}.Release|x86.Build.0 = Release|x86
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|x86.ActiveCfg = Debug|x86
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Debug|x86.Build.0 = Debug|x86
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|x86.ActiveCfg = Release|x86
-		{6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|x86.Build.0 = Release|x86
 		{AABE6A3C-F038-4448-981F-F68A6D5069C3}.Debug|Any CPU.ActiveCfg = Debug
 		{AABE6A3C-F038-4448-981F-F68A6D5069C3}.Debug|x86.ActiveCfg = Debug
 		{AABE6A3C-F038-4448-981F-F68A6D5069C3}.Release|Any CPU.ActiveCfg = Release