diff --git a/libtgvoip.UWP.vcxproj b/libtgvoip.UWP.vcxproj
index aa4c104..0d1951c 100644
--- a/libtgvoip.UWP.vcxproj
+++ b/libtgvoip.UWP.vcxproj
@@ -34,7 +34,7 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <ProjectName>libtgvoip</ProjectName>
@@ -76,27 +76,27 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
+    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
+    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
+    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
+    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
+    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.15063.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
+    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -229,17 +229,17 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="audio\AudioInput.h" />
+    <ClInclude Include="audio\AudioIO.h" />
     <ClInclude Include="audio\AudioOutput.h" />
     <ClInclude Include="audio\Resampler.h" />
     <ClInclude Include="BlockingQueue.h" />
-    <ClInclude Include="BufferInputStream.h" />
-    <ClInclude Include="BufferOutputStream.h" />
-    <ClInclude Include="BufferPool.h" />
+    <ClInclude Include="Buffers.h" />
     <ClInclude Include="CongestionControl.h" />
     <ClInclude Include="EchoCanceller.h" />
     <ClInclude Include="JitterBuffer.h" />
     <ClInclude Include="logging.h" />
     <ClInclude Include="MediaStreamItf.h" />
+    <ClInclude Include="MessageThread.h" />
     <ClInclude Include="NetworkSocket.h" />
     <ClInclude Include="OpusDecoder.h" />
     <ClInclude Include="OpusEncoder.h" />
@@ -247,7 +247,9 @@
     <ClInclude Include="os\windows\AudioOutputWASAPI.h" />
     <ClInclude Include="os\windows\NetworkSocketWinsock.h" />
     <ClInclude Include="os\windows\WindowsSandboxUtils.h" />
+    <ClInclude Include="PacketReassembler.h" />
     <ClInclude Include="threading.h" />
+    <ClInclude Include="utils.h" />
     <ClInclude Include="VoIPController.h" />
     <ClInclude Include="os\windows\CXWrapper.h" />
     <ClInclude Include="VoIPServerConfig.h" />
@@ -312,17 +314,17 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="audio\AudioInput.cpp" />
+    <ClCompile Include="audio\AudioIO.cpp" />
     <ClCompile Include="audio\AudioOutput.cpp" />
     <ClCompile Include="audio\Resampler.cpp" />
     <ClCompile Include="BlockingQueue.cpp" />
-    <ClCompile Include="BufferInputStream.cpp" />
-    <ClCompile Include="BufferOutputStream.cpp" />
-    <ClCompile Include="BufferPool.cpp" />
+    <ClCompile Include="Buffers.cpp" />
     <ClCompile Include="CongestionControl.cpp" />
     <ClCompile Include="EchoCanceller.cpp" />
     <ClCompile Include="JitterBuffer.cpp" />
     <ClCompile Include="logging.cpp" />
     <ClCompile Include="MediaStreamItf.cpp" />
+    <ClCompile Include="MessageThread.cpp" />
     <ClCompile Include="NetworkSocket.cpp" />
     <ClCompile Include="OpusDecoder.cpp" />
     <ClCompile Include="OpusEncoder.cpp" />
@@ -330,8 +332,10 @@
     <ClCompile Include="os\windows\AudioOutputWASAPI.cpp" />
     <ClCompile Include="os\windows\NetworkSocketWinsock.cpp" />
     <ClCompile Include="os\windows\WindowsSandboxUtils.cpp" />
+    <ClCompile Include="PacketReassembler.cpp" />
     <ClCompile Include="VoIPController.cpp" />
     <ClCompile Include="os\windows\CXWrapper.cpp" />
+    <ClCompile Include="VoIPGroupController.cpp" />
     <ClCompile Include="VoIPServerConfig.cpp" />
     <ClCompile Include="webrtc_dsp\webrtc\base\checks.cc" />
     <ClCompile Include="webrtc_dsp\webrtc\base\stringutils.cc" />
@@ -502,7 +506,12 @@
     <ClCompile Include="webrtc_dsp\webrtc\system_wrappers\source\cpu_features.cc" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsMobile, Version=10.0.15063.0" />
+    <ProjectReference Include="..\libopus\libopus.vcxproj">
+      <Project>{904ac506-51a0-474e-9f55-ec3febbcccd9}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="WindowsMobile, Version=10.0.17134.0" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
diff --git a/libtgvoip.UWP.vcxproj.filters b/libtgvoip.UWP.vcxproj.filters
index 18a0832..d4b8705 100644
--- a/libtgvoip.UWP.vcxproj.filters
+++ b/libtgvoip.UWP.vcxproj.filters
@@ -19,9 +19,7 @@
     <ClCompile Include="VoIPController.cpp" />
     <ClCompile Include="VoIPServerConfig.cpp" />
     <ClCompile Include="BlockingQueue.cpp" />
-    <ClCompile Include="BufferInputStream.cpp" />
-    <ClCompile Include="BufferOutputStream.cpp" />
-    <ClCompile Include="BufferPool.cpp" />
+    <ClCompile Include="Buffers.cpp" />
     <ClCompile Include="CongestionControl.cpp" />
     <ClCompile Include="EchoCanceller.cpp" />
     <ClCompile Include="JitterBuffer.cpp" />
@@ -273,14 +271,18 @@
     <ClCompile Include="os\windows\CXWrapper.cpp">
       <Filter>windows</Filter>
     </ClCompile>
+    <ClCompile Include="VoIPGroupController.cpp" />
+    <ClCompile Include="PacketReassembler.cpp" />
+    <ClCompile Include="MessageThread.cpp" />
+    <ClCompile Include="audio\AudioIO.cpp">
+      <Filter>audio</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="VoIPController.h" />
     <ClInclude Include="VoIPServerConfig.h" />
     <ClInclude Include="BlockingQueue.h" />
-    <ClInclude Include="BufferInputStream.h" />
-    <ClInclude Include="BufferOutputStream.h" />
-    <ClInclude Include="BufferPool.h" />
+    <ClInclude Include="Buffers.h" />
     <ClInclude Include="CongestionControl.h" />
     <ClInclude Include="EchoCanceller.h" />
     <ClInclude Include="JitterBuffer.h" />
@@ -488,5 +490,11 @@
     <ClInclude Include="os\windows\CXWrapper.h">
       <Filter>windows</Filter>
     </ClInclude>
+    <ClInclude Include="PacketReassembler.h" />
+    <ClInclude Include="MessageThread.h" />
+    <ClInclude Include="audio\AudioIO.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="utils.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/os/windows/WindowsSandboxUtils.h b/os/windows/WindowsSandboxUtils.h
index 54654f7..d188934 100644
--- a/os/windows/WindowsSandboxUtils.h
+++ b/os/windows/WindowsSandboxUtils.h
@@ -5,6 +5,9 @@
 // you should have received with this source code distribution.
 //
 
+#ifndef TGVOIP_WINDOWSSANDBOXUTILS_H
+#define TGVOIP_WINDOWSSANDBOXUTILS_H
+
 #include <audioclient.h>
 #include <windows.h>
 #ifndef TGVOIP_WP_SILVERLIGHT
@@ -36,3 +39,5 @@ namespace tgvoip {
 		static IAudioClient2* ActivateAudioDevice(const wchar_t* devID, HRESULT* callResult, HRESULT* actResult);
 	};
 }
+
+#endif //TGVOIP_WINDOWSSANDBOXUTILS_H