diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 121cf0b..caa313a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ env:
   # solution path doesn't need slashes unless there it is multiple folders deep
   # solution name does not include extension. .sln is assumed
   SOLUTION_PATH: Pepperdash Core
-  SOLUTION_FILE: PepperDash Core
+  SOLUTION_FILE: PepperDash Core 4-series
   # Do not edit this, we're just creating it here
   VERSION: 0.0.0-buildtype-buildnumber
   # Defaults to debug for build type
@@ -20,163 +20,22 @@ env:
   # Defaults to main as the release branch.  Change as necessary
   RELEASE_BRANCH: main
 jobs:
-  Build_Project:
-    runs-on: windows-2019
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      # And any submodules
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          git config --global url."https://github.com/".insteadOf "git@github.com:"
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-        # Fetch all tags
-      - name: Fetch tags
-        run: git fetch --tags
-      # Generate the appropriate version number
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          $version = ./.github/scripts/GenerateVersionNumber.ps1
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Use the version number to set the version of the assemblies
-      - name: Update AssemblyInfo.cs
-        shell: powershell
-        run: |
-          Write-Output ${{ env.VERSION }}
-          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
-      # Login to Docker
-      - name: Login to Docker
-        uses: azure/docker-login@v1
-        with:
-          username: ${{ secrets.dockerhub_user }}
-          password: ${{ secrets.dockerhub_password }}
-      # Build the solutions in the docker image
-      - name: Build Solution
-        shell: powershell
-        run: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
-      - name: Zip Build Output
-        shell: powershell
-        run: ./.github/scripts/ZipBuildOutput.ps1
-      # Write the version to a file to be consumed by the push jobs
-      - name: Write Version
-        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
-      # Upload the build output as an artifact
-      - name: Upload Build Output
-        uses: actions/upload-artifact@v1
-        with:
-          name: Build
-          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-      # Upload the Version file as an artifact
-      - name: Upload version.txt
-        uses: actions/upload-artifact@v1
-        with:
-          name: Version
-          path: ${{env.GITHUB_HOME}}\output\version.txt
-      # Create the release on the source repo
-      - name: Create tag for non-rc builds
-        if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
-        run: |
-          git tag $($Env:VERSION)
-          git push --tags origin
-      - name: Create Release
-        id: create_release
-        # using contributor's version to allow for pointing at the right commit
-        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
-        uses: fleskesvor/create-release@feature/support-target-commitish
-        with:
-          tag_name: ${{ env.VERSION  }}
-          release_name: ${{ env.VERSION }}
-          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Upload the build package to the release
-      - name: Upload Release Package
-        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
-        id: upload_release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
-  Push_Nuget_Package:
-    needs: Build_Project
-    runs-on: windows-latest
-    steps:
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      - name: Add nuget.exe
-        uses: nuget/setup-nuget@v1
-      - name: Add Github Packages source
-        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-      - name: Add nuget.org API Key
-        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
-      - name: Create nuget package
-        run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }}
-      - name: Publish nuget package to Github registry
-        run: nuget push **/*.nupkg -source github
-      - name: Publish nuget package to nuget.org
-        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
   Build_Project_4-Series:
     runs-on: windows-latest
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+    steps:      
+      - uses: actions/checkout@v3
       # Fetch all tags
       - name: Fetch tags
         run: git fetch --tags
       # Generate the appropriate version number
       - name: Set Version Number
+        id: setVersion
         shell: powershell
         run: |
           $version = ./.github/scripts/GenerateVersionNumber.ps1
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Use the version number to set the version of the assemblies
-      - name: Update AssemblyInfo.cs
-        shell: powershell
-        run: |
-          Write-Output ${{ env.VERSION }}
-          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
-      - name: Setup MS-Build
-        uses: microsoft/setup-msbuild@v1
+          echo "version=$version" | $GITHUB_OUTPUT      
+      - name: Setup MS Build
+        uses: microsoft/setup-msbuild@v1.1
       - name: restore Nuget Packages
         run: nuget restore ./$($Env:SOLUTION_PATH)/$($Env:SOLUTION_FILE)
         env:
@@ -185,92 +44,24 @@ jobs:
       - name: Build Solution
         shell: powershell
         run: |
-          msbuild "./$($Env:SOLUTION_PATH)/$($Env:SOLUTION_FILE) 4-Series.sln" /p:platform="Any CPU" /p:configuration="Debug"
-      # Zip up the output files as needed
-      - name: Zip Build Output
-        shell: powershell
-        run: |
-          $destination = "$($Env:GITHUB_HOME)\output"
-          New-Item -ItemType Directory -Force -Path ($destination)
-          Get-ChildItem ($destination)
-          $exclusions = @("packages", "3-series")
-          # Trying to get any .json schema files (not currently working)
-          # Gets any files with the listed extensions.
-          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object {
-            $allowed = $true;
-            # Exclude any files in submodules
-            foreach ($exclude in $exclusions) {
-              if ((Split-Path $_.FullName -Parent).contains("$($exclude)")) {
-                $allowed = $false;
-                break;
-              }
-            }
-            if ($allowed) {
-              Write-Host "allowing $($_)"
-              $_;
-            }
-          } | Copy-Item -Destination ($destination) -Force
-          Write-Host "Getting matching files..."
-          # Get any files from the output folder that match the following extensions
-          Get-ChildItem -Path $destination | Where-Object {($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz"))} | ForEach-Object { 
-            # Replace the extensions with dll and xml and create an array 
-            $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml"))
-            Write-Host "Filenames:"
-            Write-Host $filenames
-            if ($filenames.length -gt 0) {
-              # Attempt to get the files and return them to the output directory
-              Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force
-            }
-          }
-          Get-ChildItem -Path $destination\*.cplz | Rename-Item -NewName { "$($_.BaseName)-4s-$($Env:VERSION)$($_.Extension)" }
-          Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-4s-$($Env:VERSION).zip" -Force
-          Write-Host "Output Contents post Zip"
-          Get-ChildItem -Path $destination
-      # Write the version to a file to be consumed by the push jobs
-      - name: Write Version
-        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
-      # Upload output files
-      - name: Upload Build Output
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip
-          path: ./${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip
-      # Upload the Version file as an artifact
-      - name: Upload version.txt
-        uses: actions/upload-artifact@v1
-        with:
-          name: Version
-          path: ${{env.GITHUB_HOME}}\output\version.txt
+          msbuild "./$($Env:SOLUTION_PATH)/$($Env:SOLUTION_FILE) 4-Series.sln" -p:Platform="Any CPU" -p:Configuration="Debug -p:VersionPrefix=$(steps.setVersion.outputs.version)"
       - name: Create tag for non-rc builds
         if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
         run: |
-          git tag $($Env:VERSION)-4-Series
+          git tag $($Env:VERSION)
           git push --tags origin
       # Create the release on the source repo
       - name: Create Release
         id: create_release
-        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
+        if: contains(steps.setVersion.outputs.version,'-rc-') || contains(steps.setVersion.outputs.version,'-hotfix-')
         uses: actions/create-release@v1
         with:
-          tag_name: ${{ env.VERSION  }}-4-Series
-          release_name: ${{ env.VERSION }}-4-Series
+          tag_name: ${{ env.VERSION  }}
+          release_name: ${{ env.VERSION }}
           prerelease: ${{contains('debug', env.BUILD_TYPE)}}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload the build package to the release
-      - name: Upload Release Package
-        id: upload_release
-        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip
-          asset_name: ${{ env.SOLUTION_FILE}}-4s-${{ env.VERSION}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Add nuget.exe
-        uses: nuget/setup-nuget@v1
       - name: Add Github Packages source
         run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
       - name: Add nuget.org API Key
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj
index 4ab23d3..1816199 100644
--- a/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj	
+++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj	
@@ -1,160 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" 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>{E7376F15-9E7B-418E-83C2-ADFB5D4DFD8D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PepperDash.Core</RootNamespace>
     <AssemblyName>PepperDashCore</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net472</TargetFramework>
     <Deterministic>false</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NeutralLanguage>en</NeutralLanguage>
+    <OutputPath>bin\4Series\$(Configuration)\</OutputPath>
+    <SignAssembly>False</SignAssembly>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Title>PepperDash Core</Title>
+    <Company>PepperDash Technologies</Company>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/PepperDash/PepperDashCore</RepositoryUrl>
+    <PackageTags>crestron;4series;</PackageTags>
+    <Version>$(Version)</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\4Series\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;SERIES4</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\4Series\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\4Series\Release\PepperDashCore.xml</DocumentationFile>
+    <DocumentationFile>bin\4Series\$(Configuration)\PepperDashCore.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SimplSharpAutoUpdateInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpAutoUpdateInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpCryptographyInterface, Version=1.0.6197.21123, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpCryptographyInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpCustomAttributesInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpCWSHelperInterface, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpCWSHelperInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpExchangeWebServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpExchangeWebServices.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpHelperInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpNewtonsoft.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpOnvifInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpOnvifInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpProgrammingInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpProgrammingInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpReflectionInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpSQLHelperInterface, Version=1.0.92.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpSQLHelperInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\lib\net47\SimplSharpTimerEventInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationExtras.cs" />
-    <Compile Include="Comm\CommunicationGather.cs" />
-    <Compile Include="Comm\CommunicationStreamDebugging.cs" />
-    <Compile Include="Comm\ControlPropertiesConfig.cs" />
-    <Compile Include="Comm\eControlMethods.cs" />
-    <Compile Include="Comm\EventArgs.cs" />
-    <Compile Include="Comm\FINISH CommStatic.cs" />
-    <Compile Include="Comm\GenericHttpSseClient.cs" />
-    <Compile Include="Comm\GenericSecureTcpIpClient.cs" />
-    <Compile Include="Comm\GenericSecureTcpIpClient_ForServer.cs" />
-    <Compile Include="Comm\GenericSecureTcpIpServer.cs" />
-    <Compile Include="Comm\GenericSshClient.cs" />
-    <Compile Include="Comm\GenericTcpIpClient.cs" />
-    <Compile Include="Comm\GenericTcpIpClient_ForServer.cs" />
-    <Compile Include="Comm\GenericTcpIpServer.cs" />
-    <Compile Include="Comm\GenericUdpServer.cs" />
-    <Compile Include="Comm\QscCoreDoubleTcpIpClient.cs" />
-    <Compile Include="Comm\TcpClientConfigObject.cs" />
-    <Compile Include="Comm\TcpServerConfigObject.cs" />
-    <Compile Include="Config\PortalConfigReader.cs" />
-    <Compile Include="Conversion\Convert.cs" />
-    <Compile Include="CoreInterfaces.cs" />
-    <Compile Include="Device.cs" />
-    <Compile Include="EthernetHelper.cs" />
-    <Compile Include="EventArgs.cs" />
-    <Compile Include="GenericRESTfulCommunications\Constants.cs" />
-    <Compile Include="GenericRESTfulCommunications\GenericRESTfulClient.cs" />
-    <Compile Include="JsonStandardObjects\EventArgs and Constants.cs" />
-    <Compile Include="JsonStandardObjects\JsonToSimplDevice.cs" />
-    <Compile Include="JsonStandardObjects\JsonToSimplDeviceConfig.cs" />
-    <Compile Include="JsonToSimpl\Constants.cs" />
-    <Compile Include="JsonToSimpl\Global.cs" />
-    <Compile Include="JsonToSimpl\JsonToSimplArrayLookupChild.cs" />
-    <Compile Include="JsonToSimpl\JsonToSimplChildObjectBase.cs" />
-    <Compile Include="JsonToSimpl\JsonToSimplFileMaster.cs" />
-    <Compile Include="JsonToSimpl\JsonToSimplFixedPathObject.cs" />
-    <Compile Include="JsonToSimpl\JsonToSimplGenericMaster.cs" />
-    <Compile Include="JsonToSimpl\JsonToSimplMaster.cs" />
-    <Compile Include="JsonToSimpl\JsonToSimplPortalFileMaster.cs" />
-    <Compile Include="JsonToSimpl\REMOVE JsonToSimplFixedPathObject.cs" />
-    <Compile Include="Logging\Debug.cs" />
-    <Compile Include="Logging\DebugContext.cs" />
-    <Compile Include="Logging\DebugMemory.cs" />
-    <Compile Include="Network\DiscoveryThings.cs" />
-    <Compile Include="PasswordManagement\Config.cs" />
-    <Compile Include="PasswordManagement\Constants.cs" />
-    <Compile Include="PasswordManagement\PasswordClient.cs" />
-    <Compile Include="PasswordManagement\PasswordManager.cs" />
-    <Compile Include="Properties\4-Series\AssemblyInfo.cs" />
-    <Compile Include="SystemInfo\EventArgs and Constants.cs" />
-    <Compile Include="SystemInfo\SystemInfoConfig.cs" />
-    <Compile Include="SystemInfo\SystemInfoToSimpl.cs" />
-    <Compile Include="WebApi\Presets\Preset.cs" />
-    <Compile Include="WebApi\Presets\User.cs" />
-    <Compile Include="WebApi\Presets\WebApiPasscodeClient.cs" />
-    <Compile Include="XSigUtility\Serialization\IXSigSerialization.cs" />
-    <Compile Include="XSigUtility\Serialization\XSigSerializationException.cs" />
-    <Compile Include="XSigUtility\Tokens\XSigAnalogToken.cs" />
-    <Compile Include="XSigUtility\Tokens\XSigDigitalToken.cs" />
-    <Compile Include="XSigUtility\Tokens\XSigSerialToken.cs" />
-    <Compile Include="XSigUtility\Tokens\XSigToken.cs" />
-    <Compile Include="XSigUtility\Tokens\XSigTokenType.cs" />
-    <Compile Include="XSigUtility\XSigHelpers.cs" />
-    <Compile Include="XSigUtility\XSigTokenStreamReader.cs" />
-    <Compile Include="XSigUtility\XSigTokenStreamWriter.cs" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.19.35" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Compile Remove="Comm\._GenericSshClient.cs" />
+    <Compile Remove="Comm\._GenericTcpIpClient.cs" />
+    <Compile Remove="Comm\DynamicTCPServer.cs" />
+    <Compile Remove="PasswordManagement\OLD-ARRAY-Config.cs" />
+    <Compile Remove="PasswordManagement\OLD-ARRAY-PasswordClient.cs" />
+    <Compile Remove="PasswordManagement\OLD-ARRAY-PasswordManager.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\build\Crestron.SimplSharp.SDK.Library.targets" Condition="Exists('..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\build\Crestron.SimplSharp.SDK.Library.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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('..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\build\Crestron.SimplSharp.SDK.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Crestron.SimplSharp.SDK.Library.2.19.35\build\Crestron.SimplSharp.SDK.Library.targets'))" />
-  </Target>
 </Project>
\ No newline at end of file