diff --git a/DVMHost.sln b/DVMHost.sln
deleted file mode 100644
index bf544b6e..00000000
--- a/DVMHost.sln
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dvmhost", "DVMHost.vcxproj", "{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dvmcmd", "remote\DVMCmd.vcxproj", "{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Debug|Any CPU.Build.0 = Debug|Win32
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Debug|x64.ActiveCfg = Debug|x64
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Debug|x64.Build.0 = Debug|x64
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Debug|x86.ActiveCfg = Debug|Win32
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Debug|x86.Build.0 = Debug|Win32
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Release|Any CPU.ActiveCfg = Release|Win32
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Release|Any CPU.Build.0 = Release|Win32
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Release|x64.ActiveCfg = Release|x64
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Release|x64.Build.0 = Release|x64
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Release|x86.ActiveCfg = Release|Win32
-		{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}.Release|x86.Build.0 = Release|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Debug|Any CPU.Build.0 = Debug|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Debug|x64.ActiveCfg = Debug|x64
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Debug|x64.Build.0 = Debug|x64
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Debug|x86.ActiveCfg = Debug|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Debug|x86.Build.0 = Debug|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Release|Any CPU.ActiveCfg = Release|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Release|Any CPU.Build.0 = Release|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Release|x64.ActiveCfg = Release|x64
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Release|x64.Build.0 = Release|x64
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Release|x86.ActiveCfg = Release|Win32
-		{7686FC39-EC3C-4FAC-8C7D-32CF98D14F16}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3CD6A8DC-348C-4B31-99A0-91AEE2F79121}
-	EndGlobalSection
-EndGlobal
diff --git a/DVMHost.vcxproj b/DVMHost.vcxproj
deleted file mode 100644
index bdbb9072..00000000
--- a/DVMHost.vcxproj
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1D34E8C1-CFA5-4D60-B509-9DB58DC4AE92}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>DVMHost</RootNamespace>
-    <ProjectName>dvmhost</ProjectName>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent />
-    <PreBuildEvent />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="dmr\acl\AccessControl.h" />
-    <ClInclude Include="dmr\ControlPacket.h" />
-    <ClInclude Include="dmr\data\Data.h" />
-    <ClInclude Include="dmr\data\DataHeader.h" />
-    <ClInclude Include="dmr\data\EMB.h" />
-    <ClInclude Include="dmr\data\EmbeddedData.h" />
-    <ClInclude Include="dmr\Control.h" />
-    <ClInclude Include="dmr\DataPacket.h" />
-    <ClInclude Include="dmr\DMRDefines.h" />
-    <ClInclude Include="dmr\DMRUtils.h" />
-    <ClInclude Include="dmr\lc\PrivacyLC.h" />
-    <ClInclude Include="dmr\SiteData.h" />
-    <ClInclude Include="dmr\Slot.h" />
-    <ClInclude Include="dmr\SlotType.h" />
-    <ClInclude Include="dmr\Sync.h" />
-    <ClInclude Include="dmr\VoicePacket.h" />
-    <ClInclude Include="dmr\edac\Trellis.h" />
-    <ClInclude Include="dmr\lc\CSBK.h" />
-    <ClInclude Include="dmr\lc\FullLC.h" />
-    <ClInclude Include="dmr\lc\LC.h" />
-    <ClInclude Include="dmr\lc\ShortLC.h" />
-    <ClInclude Include="edac\AMBEFEC.h" />
-    <ClInclude Include="edac\BCH.h" />
-    <ClInclude Include="edac\BPTC19696.h" />
-    <ClInclude Include="edac\CRC.h" />
-    <ClInclude Include="edac\Golay2087.h" />
-    <ClInclude Include="edac\Golay24128.h" />
-    <ClInclude Include="edac\Hamming.h" />
-    <ClInclude Include="edac\QR1676.h" />
-    <ClInclude Include="edac\RS129.h" />
-    <ClInclude Include="edac\RS634717.h" />
-    <ClInclude Include="edac\SHA256.h" />
-    <ClInclude Include="Defines.h" />
-    <ClInclude Include="HostMain.h" />
-    <ClInclude Include="host\calibrate\Console.h" />
-    <ClInclude Include="host\calibrate\HostCal.h" />
-    <ClInclude Include="host\Host.h" />
-    <ClInclude Include="host\setup\HostSetup.h" />
-    <ClInclude Include="lookups\IdenTableLookup.h" />
-    <ClInclude Include="lookups\LookupTable.h" />
-    <ClInclude Include="lookups\RadioIdLookup.h" />
-    <ClInclude Include="lookups\RSSIInterpolator.h" />
-    <ClInclude Include="lookups\TalkgroupIdLookup.h" />
-    <ClInclude Include="modem\Modem.h" />
-    <ClInclude Include="modem\port\IModemPort.h" />
-    <ClInclude Include="modem\port\ISerialPort.h" />
-    <ClInclude Include="modem\port\ModemNullPort.h" />
-    <ClInclude Include="modem\port\UARTPort.h" />
-    <ClInclude Include="modem\port\PseudoPTYPort.h" />
-    <ClInclude Include="modem\port\UDPPort.h" />
-    <ClInclude Include="network\BaseNetwork.h" />
-    <ClInclude Include="network\Network.h" />
-    <ClInclude Include="network\RemoteControl.h" />
-    <ClInclude Include="network\UDPSocket.h" />
-    <ClInclude Include="p25\acl\AccessControl.h" />
-    <ClInclude Include="p25\data\DataBlock.h" />
-    <ClInclude Include="p25\data\DataHeader.h" />
-    <ClInclude Include="p25\data\LowSpeedData.h" />
-    <ClInclude Include="p25\dfsi\DFSIDefines.h" />
-    <ClInclude Include="p25\dfsi\DFSIVoicePacket.h" />
-    <ClInclude Include="p25\dfsi\LC.h" />
-    <ClInclude Include="p25\dfsi\DFSITrunkPacket.h" />
-    <ClInclude Include="p25\edac\Trellis.h" />
-    <ClInclude Include="p25\lc\LC.h" />
-    <ClInclude Include="p25\lc\TDULC.h" />
-    <ClInclude Include="p25\lc\TSBK.h" />
-    <ClInclude Include="p25\Audio.h" />
-    <ClInclude Include="p25\Control.h" />
-    <ClInclude Include="p25\DataPacket.h" />
-    <ClInclude Include="p25\VoicePacket.h" />
-    <ClInclude Include="p25\TrunkPacket.h" />
-    <ClInclude Include="p25\P25Defines.h" />
-    <ClInclude Include="p25\NID.h" />
-    <ClInclude Include="p25\SiteData.h" />
-    <ClInclude Include="p25\P25Utils.h" />
-    <ClInclude Include="p25\Sync.h" />
-    <ClInclude Include="Log.h" />
-    <ClInclude Include="Mutex.h" />
-    <ClInclude Include="RingBuffer.h" />
-    <ClInclude Include="StopWatch.h" />
-    <ClInclude Include="Thread.h" />
-    <ClInclude Include="Timer.h" />
-    <ClInclude Include="Utils.h" />
-    <ClInclude Include="yaml\Yaml.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dmr\acl\AccessControl.cpp" />
-    <ClCompile Include="dmr\ControlPacket.cpp" />
-    <ClCompile Include="dmr\data\Data.cpp" />
-    <ClCompile Include="dmr\data\DataHeader.cpp" />
-    <ClCompile Include="dmr\data\EMB.cpp" />
-    <ClCompile Include="dmr\data\EmbeddedData.cpp" />
-    <ClCompile Include="dmr\Control.cpp" />
-    <ClCompile Include="dmr\DataPacket.cpp" />
-    <ClCompile Include="dmr\lc\PrivacyLC.cpp" />
-    <ClCompile Include="dmr\Slot.cpp" />
-    <ClCompile Include="dmr\SlotType.cpp" />
-    <ClCompile Include="dmr\Sync.cpp" />
-    <ClCompile Include="dmr\VoicePacket.cpp" />
-    <ClCompile Include="dmr\edac\Trellis.cpp" />
-    <ClCompile Include="dmr\lc\CSBK.cpp" />
-    <ClCompile Include="dmr\lc\FullLC.cpp" />
-    <ClCompile Include="dmr\lc\LC.cpp" />
-    <ClCompile Include="dmr\lc\ShortLC.cpp" />
-    <ClCompile Include="edac\AMBEFEC.cpp" />
-    <ClCompile Include="edac\BCH.cpp" />
-    <ClCompile Include="edac\BPTC19696.cpp" />
-    <ClCompile Include="edac\CRC.cpp" />
-    <ClCompile Include="edac\Golay2087.cpp" />
-    <ClCompile Include="edac\Golay24128.cpp" />
-    <ClCompile Include="edac\Hamming.cpp" />
-    <ClCompile Include="edac\QR1676.cpp" />
-    <ClCompile Include="edac\RS129.cpp" />
-    <ClCompile Include="edac\RS634717.cpp" />
-    <ClCompile Include="edac\SHA256.cpp" />
-    <ClCompile Include="HostMain.cpp" />
-    <ClCompile Include="host\calibrate\Console.cpp" />
-    <ClCompile Include="host\calibrate\HostCal.cpp" />
-    <ClCompile Include="host\Host.cpp" />
-    <ClCompile Include="host\setup\HostSetup.cpp" />
-    <ClCompile Include="lookups\IdenTableLookup.cpp" />
-    <ClCompile Include="lookups\RadioIdLookup.cpp" />
-    <ClCompile Include="lookups\RSSIInterpolator.cpp" />
-    <ClCompile Include="lookups\TalkgroupIdLookup.cpp" />
-    <ClCompile Include="modem\Modem.cpp" />
-    <ClCompile Include="modem\port\IModemPort.cpp" />
-    <ClCompile Include="modem\port\ISerialPort.cpp" />
-    <ClCompile Include="modem\port\ModemNullPort.cpp" />
-    <ClCompile Include="modem\port\UARTPort.cpp" />
-    <ClCompile Include="modem\port\PseudoPTYPort.cpp" />
-    <ClCompile Include="modem\port\UDPPort.cpp" />
-    <ClCompile Include="network\BaseNetwork.cpp" />
-    <ClCompile Include="network\Network.cpp" />
-    <ClCompile Include="network\RemoteControl.cpp" />
-    <ClCompile Include="network\UDPSocket.cpp" />
-    <ClCompile Include="p25\acl\AccessControl.cpp" />
-    <ClCompile Include="p25\data\DataBlock.cpp" />
-    <ClCompile Include="p25\data\DataHeader.cpp" />
-    <ClCompile Include="p25\data\LowSpeedData.cpp" />
-    <ClCompile Include="p25\dfsi\DFSIVoicePacket.cpp" />
-    <ClCompile Include="p25\dfsi\LC.cpp" />
-    <ClCompile Include="p25\dfsi\DFSITrunkPacket.cpp" />
-    <ClCompile Include="p25\edac\Trellis.cpp" />
-    <ClCompile Include="p25\lc\LC.cpp" />
-    <ClCompile Include="p25\lc\TDULC.cpp" />
-    <ClCompile Include="p25\lc\TSBK.cpp" />
-    <ClCompile Include="p25\Audio.cpp" />
-    <ClCompile Include="p25\Control.cpp" />
-    <ClCompile Include="p25\DataPacket.cpp" />
-    <ClCompile Include="p25\TrunkPacket.cpp" />
-    <ClCompile Include="p25\VoicePacket.cpp" />
-    <ClCompile Include="p25\NID.cpp" />
-    <ClCompile Include="p25\P25Utils.cpp" />
-    <ClCompile Include="p25\Sync.cpp" />
-    <ClCompile Include="Log.cpp" />
-    <ClCompile Include="Mutex.cpp" />
-    <ClCompile Include="StopWatch.cpp" />
-    <ClCompile Include="Thread.cpp" />
-    <ClCompile Include="Timer.cpp" />
-    <ClCompile Include="Utils.cpp" />
-    <ClCompile Include="yaml\Yaml.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CopyFileToFolders Include="config.example.yml">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-      <FileType>Document</FileType>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </CopyFileToFolders>
-    <None Include="cpp.hint" />
-    <None Include="iden_channel_calc.py" />
-    <CopyFileToFolders Include="iden_table.dat">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-      <FileType>Document</FileType>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </CopyFileToFolders>
-    <None Include="Makefile" />
-    <CopyFileToFolders Include="RSSI.dat">
-      <FileType>Document</FileType>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="rid_acl.example.dat">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-      <FileType>Document</FileType>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="tg_acl.example.dat">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-      <FileType>Document</FileType>
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </CopyFileToFolders>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/DVMHost.vcxproj.filters b/DVMHost.vcxproj.filters
deleted file mode 100644
index 8cb4b8dc..00000000
--- a/DVMHost.vcxproj.filters
+++ /dev/null
@@ -1,626 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\p25">
-      <UniqueIdentifier>{d76c896d-81a1-4571-a979-85bbe05f6ff2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\dmr">
-      <UniqueIdentifier>{b48c6e95-0721-492e-b1ea-7ec159b0ad47}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\edac">
-      <UniqueIdentifier>{6af8b815-9965-4986-b628-1dc3f551ec6a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\p25">
-      <UniqueIdentifier>{9cbfad41-aaef-4b33-bfa5-1c6dd6c245c9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\dmr">
-      <UniqueIdentifier>{0db9bf97-4035-4390-8e6e-2aac5d51dbc4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\edac">
-      <UniqueIdentifier>{8e26b0a3-a3ad-4d67-bc50-c725212e96a1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\modem">
-      <UniqueIdentifier>{1e5fc186-1e05-48e3-a775-dc2b28e6b554}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\network">
-      <UniqueIdentifier>{916a1400-af49-4141-912a-eb51ee88e24a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\modem">
-      <UniqueIdentifier>{11b92d52-caf4-4a9e-86dc-6188084d91d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\network">
-      <UniqueIdentifier>{364613af-689a-40ff-9eb0-9ed75ec264d0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\dmr\acl">
-      <UniqueIdentifier>{7c629c3c-e84b-48f4-9dde-061d737bf36d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\dmr\lc">
-      <UniqueIdentifier>{4ea80282-86d8-4253-8fe1-ea332ba13e09}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\dmr\data">
-      <UniqueIdentifier>{9e7cd2a6-f295-456f-aa3a-4328994acad2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\dmr\acl">
-      <UniqueIdentifier>{0405cae8-d22a-4120-b228-3c2250948346}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\dmr\lc">
-      <UniqueIdentifier>{f490b092-2827-4999-b3ee-bf978975894a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\dmr\data">
-      <UniqueIdentifier>{87267b26-6d3b-4b44-9c34-93860af6bff2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\dmr\edac">
-      <UniqueIdentifier>{ac49360e-4207-433b-a3db-1974710de8b8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\dmr\edac">
-      <UniqueIdentifier>{6de4c69f-fa55-405e-a92f-3fdec05414c5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\p25\acl">
-      <UniqueIdentifier>{ee5bbcfb-d1bf-47fb-88b4-1b76100d1c0f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\p25\lc">
-      <UniqueIdentifier>{77d81332-702f-487a-b155-dcc38f2831f0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\p25\data">
-      <UniqueIdentifier>{ac8d97b8-a9bd-48e3-9fb9-08e997d055d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\p25\dfsi">
-      <UniqueIdentifier>{c53673fd-d7d5-49f2-a8e4-5a92e379f436}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\p25\edac">
-      <UniqueIdentifier>{94f78cbc-78b5-454e-972d-89ff595eca17}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\p25\acl">
-      <UniqueIdentifier>{bae82c0a-4986-4f77-a85e-e865b77993b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\p25\lc">
-      <UniqueIdentifier>{453ece82-3382-481b-b8a6-560f085e1d0d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\p25\data">
-      <UniqueIdentifier>{d742b2cf-71b2-45a1-afbd-753128c38f66}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\p25\dfsi">
-      <UniqueIdentifier>{7c4122c6-5105-4c86-ac60-3a9873921535}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\p25\edac">
-      <UniqueIdentifier>{07a6e6a8-699e-41a9-9e0f-0a8a064b2331}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\lookups">
-      <UniqueIdentifier>{d602c3e6-4a28-4d6f-a0f6-49b54978ce71}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\lookups">
-      <UniqueIdentifier>{89dd7bc2-bdf5-4ae8-ba5b-f44abdaba5e8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\yaml">
-      <UniqueIdentifier>{a085e2ea-d75f-4eef-b7f1-1cb100cd6323}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\yaml">
-      <UniqueIdentifier>{3f236928-1cc8-405c-a085-8a22404b5887}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\host">
-      <UniqueIdentifier>{5a6c9478-41b0-41e3-8511-4d58e7edc38f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\host">
-      <UniqueIdentifier>{f4690a68-efe2-4d42-a449-3b25d20d18a1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\host\calibrate">
-      <UniqueIdentifier>{f8c0460a-c82a-430c-8ad7-eac5ad528ca7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\host\calibrate">
-      <UniqueIdentifier>{3a6ae793-a482-46fe-9fd3-93476ccb591d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\modem\port">
-      <UniqueIdentifier>{25f65018-5057-418b-ae56-b6ed06395099}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\modem\port">
-      <UniqueIdentifier>{bd26735c-6610-4bfe-b1c4-27da1cb18e29}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\host\setup">
-      <UniqueIdentifier>{fdb4c489-755e-4655-a0e3-b1174c8e7acc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\host\setup">
-      <UniqueIdentifier>{145b73dd-7759-4018-9df2-af162f652699}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Defines.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RingBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="StopWatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\AMBEFEC.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\BCH.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\BPTC19696.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\CRC.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\Golay2087.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\Golay24128.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\Hamming.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\QR1676.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\RS129.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\SHA256.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="modem\Modem.h">
-      <Filter>Header Files\modem</Filter>
-    </ClInclude>
-    <ClInclude Include="network\Network.h">
-      <Filter>Header Files\network</Filter>
-    </ClInclude>
-    <ClInclude Include="network\UDPSocket.h">
-      <Filter>Header Files\network</Filter>
-    </ClInclude>
-    <ClInclude Include="edac\RS634717.h">
-      <Filter>Header Files\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="network\RemoteControl.h">
-      <Filter>Header Files\network</Filter>
-    </ClInclude>
-    <ClInclude Include="lookups\IdenTableLookup.h">
-      <Filter>Header Files\lookups</Filter>
-    </ClInclude>
-    <ClInclude Include="lookups\LookupTable.h">
-      <Filter>Header Files\lookups</Filter>
-    </ClInclude>
-    <ClInclude Include="lookups\RadioIdLookup.h">
-      <Filter>Header Files\lookups</Filter>
-    </ClInclude>
-    <ClInclude Include="lookups\RSSIInterpolator.h">
-      <Filter>Header Files\lookups</Filter>
-    </ClInclude>
-    <ClInclude Include="lookups\TalkgroupIdLookup.h">
-      <Filter>Header Files\lookups</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\P25Defines.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\P25Utils.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\acl\AccessControl.h">
-      <Filter>Header Files\dmr\acl</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\data\Data.h">
-      <Filter>Header Files\dmr\data</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\data\DataHeader.h">
-      <Filter>Header Files\dmr\data</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\data\EMB.h">
-      <Filter>Header Files\dmr\data</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\data\EmbeddedData.h">
-      <Filter>Header Files\dmr\data</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\edac\Trellis.h">
-      <Filter>Header Files\dmr\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\lc\CSBK.h">
-      <Filter>Header Files\dmr\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\lc\FullLC.h">
-      <Filter>Header Files\dmr\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\lc\LC.h">
-      <Filter>Header Files\dmr\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\lc\ShortLC.h">
-      <Filter>Header Files\dmr\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\Control.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DataPacket.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRDefines.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\Slot.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\SlotType.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\Sync.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\VoicePacket.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\acl\AccessControl.h">
-      <Filter>Header Files\p25\acl</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\data\DataBlock.h">
-      <Filter>Header Files\p25\data</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\data\DataHeader.h">
-      <Filter>Header Files\p25\data</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\data\LowSpeedData.h">
-      <Filter>Header Files\p25\data</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\edac\Trellis.h">
-      <Filter>Header Files\p25\edac</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\lc\LC.h">
-      <Filter>Header Files\p25\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\lc\TDULC.h">
-      <Filter>Header Files\p25\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\lc\TSBK.h">
-      <Filter>Header Files\p25\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\Audio.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\Control.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\DataPacket.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\NID.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\SiteData.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\Sync.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\TrunkPacket.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\VoicePacket.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="yaml\Yaml.h">
-      <Filter>Header Files\yaml</Filter>
-    </ClInclude>
-    <ClInclude Include="host\calibrate\Console.h">
-      <Filter>Header Files\host\calibrate</Filter>
-    </ClInclude>
-    <ClInclude Include="host\calibrate\HostCal.h">
-      <Filter>Header Files\host\calibrate</Filter>
-    </ClInclude>
-    <ClInclude Include="host\Host.h">
-      <Filter>Header Files\host</Filter>
-    </ClInclude>
-    <ClInclude Include="HostMain.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="network\BaseNetwork.h">
-      <Filter>Header Files\network</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\SiteData.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\ControlPacket.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="modem\port\IModemPort.h">
-      <Filter>Header Files\modem\port</Filter>
-    </ClInclude>
-    <ClInclude Include="modem\port\ISerialPort.h">
-      <Filter>Header Files\modem\port</Filter>
-    </ClInclude>
-    <ClInclude Include="modem\port\UARTPort.h">
-      <Filter>Header Files\modem\port</Filter>
-    </ClInclude>
-    <ClInclude Include="modem\port\PseudoPTYPort.h">
-      <Filter>Header Files\modem\port</Filter>
-    </ClInclude>
-    <ClInclude Include="modem\port\ModemNullPort.h">
-      <Filter>Header Files\modem\port</Filter>
-    </ClInclude>
-    <ClInclude Include="modem\port\UDPPort.h">
-      <Filter>Header Files\modem\port</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\lc\PrivacyLC.h">
-      <Filter>Header Files\dmr\lc</Filter>
-    </ClInclude>
-    <ClInclude Include="host\setup\HostSetup.h">
-      <Filter>Header Files\host\setup</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRUtils.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\dfsi\DFSIDefines.h">
-      <Filter>Header Files\p25\dfsi</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\dfsi\LC.h">
-      <Filter>Header Files\p25\dfsi</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\dfsi\DFSITrunkPacket.h">
-      <Filter>Header Files\p25\dfsi</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\dfsi\DFSIVoicePacket.h">
-      <Filter>Header Files\p25\dfsi</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StopWatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\AMBEFEC.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\BCH.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\BPTC19696.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\CRC.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\Golay2087.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\Golay24128.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\Hamming.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\QR1676.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\RS129.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\SHA256.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="network\Network.cpp">
-      <Filter>Source Files\network</Filter>
-    </ClCompile>
-    <ClCompile Include="network\UDPSocket.cpp">
-      <Filter>Source Files\network</Filter>
-    </ClCompile>
-    <ClCompile Include="modem\Modem.cpp">
-      <Filter>Source Files\modem</Filter>
-    </ClCompile>
-    <ClCompile Include="edac\RS634717.cpp">
-      <Filter>Source Files\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="network\RemoteControl.cpp">
-      <Filter>Source Files\network</Filter>
-    </ClCompile>
-    <ClCompile Include="lookups\IdenTableLookup.cpp">
-      <Filter>Source Files\lookups</Filter>
-    </ClCompile>
-    <ClCompile Include="lookups\RadioIdLookup.cpp">
-      <Filter>Source Files\lookups</Filter>
-    </ClCompile>
-    <ClCompile Include="lookups\RSSIInterpolator.cpp">
-      <Filter>Source Files\lookups</Filter>
-    </ClCompile>
-    <ClCompile Include="lookups\TalkgroupIdLookup.cpp">
-      <Filter>Source Files\lookups</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\acl\AccessControl.cpp">
-      <Filter>Source Files\dmr\acl</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\data\Data.cpp">
-      <Filter>Source Files\dmr\data</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\data\DataHeader.cpp">
-      <Filter>Source Files\dmr\data</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\data\EMB.cpp">
-      <Filter>Source Files\dmr\data</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\data\EmbeddedData.cpp">
-      <Filter>Source Files\dmr\data</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\edac\Trellis.cpp">
-      <Filter>Source Files\dmr\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\lc\CSBK.cpp">
-      <Filter>Source Files\dmr\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\lc\FullLC.cpp">
-      <Filter>Source Files\dmr\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\lc\LC.cpp">
-      <Filter>Source Files\dmr\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\lc\ShortLC.cpp">
-      <Filter>Source Files\dmr\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\Control.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DataPacket.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\Slot.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\SlotType.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\Sync.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\VoicePacket.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\acl\AccessControl.cpp">
-      <Filter>Source Files\p25\acl</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\data\DataBlock.cpp">
-      <Filter>Source Files\p25\data</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\data\DataHeader.cpp">
-      <Filter>Source Files\p25\data</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\data\LowSpeedData.cpp">
-      <Filter>Source Files\p25\data</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\edac\Trellis.cpp">
-      <Filter>Source Files\p25\edac</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\lc\LC.cpp">
-      <Filter>Source Files\p25\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\lc\TDULC.cpp">
-      <Filter>Source Files\p25\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\lc\TSBK.cpp">
-      <Filter>Source Files\p25\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\Audio.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\Control.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\DataPacket.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\NID.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\P25Utils.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\Sync.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\TrunkPacket.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\VoicePacket.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="yaml\Yaml.cpp">
-      <Filter>Source Files\yaml</Filter>
-    </ClCompile>
-    <ClCompile Include="host\Host.cpp">
-      <Filter>Source Files\host</Filter>
-    </ClCompile>
-    <ClCompile Include="host\calibrate\Console.cpp">
-      <Filter>Source Files\host\calibrate</Filter>
-    </ClCompile>
-    <ClCompile Include="host\calibrate\HostCal.cpp">
-      <Filter>Source Files\host\calibrate</Filter>
-    </ClCompile>
-    <ClCompile Include="HostMain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="network\BaseNetwork.cpp">
-      <Filter>Source Files\network</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\ControlPacket.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="modem\port\UARTPort.cpp">
-      <Filter>Source Files\modem\port</Filter>
-    </ClCompile>
-    <ClCompile Include="modem\port\PseudoPTYPort.cpp">
-      <Filter>Source Files\modem\port</Filter>
-    </ClCompile>
-    <ClCompile Include="modem\port\ModemNullPort.cpp">
-      <Filter>Source Files\modem\port</Filter>
-    </ClCompile>
-    <ClCompile Include="modem\port\UDPPort.cpp">
-      <Filter>Source Files\modem\port</Filter>
-    </ClCompile>
-    <ClCompile Include="modem\port\IModemPort.cpp">
-      <Filter>Source Files\modem\port</Filter>
-    </ClCompile>
-    <ClCompile Include="modem\port\ISerialPort.cpp">
-      <Filter>Source Files\modem\port</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\lc\PrivacyLC.cpp">
-      <Filter>Source Files\dmr\lc</Filter>
-    </ClCompile>
-    <ClCompile Include="host\setup\HostSetup.cpp">
-      <Filter>Source Files\host\setup</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\dfsi\LC.cpp">
-      <Filter>Source Files\p25\dfsi</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\dfsi\DFSITrunkPacket.cpp">
-      <Filter>Source Files\p25\dfsi</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\dfsi\DFSIVoicePacket.cpp">
-      <Filter>Source Files\p25\dfsi</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-    <None Include="cpp.hint" />
-    <None Include="iden_channel_calc.py" />
-  </ItemGroup>
-  <ItemGroup>
-    <CopyFileToFolders Include="RSSI.dat" />
-    <CopyFileToFolders Include="config.example.yml" />
-    <CopyFileToFolders Include="rid_acl.example.dat" />
-    <CopyFileToFolders Include="tg_acl.example.dat" />
-    <CopyFileToFolders Include="iden_table.dat" />
-  </ItemGroup>
-</Project>
\ No newline at end of file