diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index b4751ac0..00000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-configuration:
-  - Release
-
-platform:
-  - Win32
-  - x64
-
-before_build:
-  - cmd: git -C .. clone -q https://github.com/MediaArea/zlib.git
-  - cmd: git -C .. clone -q https://github.com/MediaArea/libxml2.git
-  - cmd: git -C .. clone -q https://github.com/MediaArea/libxslt.git
-  - cmd: git -C .. clone -q https://github.com/MediaArea/libevent.git
-  - cmd: git -C .. clone -q https://github.com/MediaArea/jansson.git
-  - cmd: git -C .. clone -q https://github.com/MediaArea/ZenLib.git
-  - cmd: git -C .. clone -q https://github.com/MediaArea/MediaInfoLib.git
-  - ps: >-
-      If ($Env:PLATFORM -Eq "Win32") {
-        perl -p '-i.bak' -e 's/..\\..\\..\\..\\Qt5.6-msvc2015\\5.6\\msvc2015/C:\\Qt\\5.6\\msvc2015/g' Project\MSVC2015\GUI\MediaConch_GUI.vcxproj
-      } else {
-        perl -p '-i.bak' -e 's/..\\..\\..\\..\\Qt5.6-msvc2015_64\\5.6\\msvc2015_64/C:\\Qt\\5.6\\msvc2015_64/g' Project\MSVC2015\GUI\MediaConch_GUI.vcxproj
-      }
-
-build:
-  project: Project\MSVC2015\MediaConch.sln
-  verbosity: quiet
diff --git a/.github/workflows/MediaConch_Checks.yml b/.github/workflows/MediaConch_Checks.yml
index e2ef8eb6..e8860ade 100644
--- a/.github/workflows/MediaConch_Checks.yml
+++ b/.github/workflows/MediaConch_Checks.yml
@@ -13,7 +13,7 @@ jobs:
       PYTHONPATH: /usr/local/lib/python2.7:/usr/local/lib/python2.7/dist-packages:/usr/local/lib/python2.7/site-packages
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Dependencies
@@ -26,17 +26,17 @@ jobs:
             pip --disable-pip-version-check install git+https://github.com/vi/mkvparse.git
           fi
           if [ "$RUNNER_OS" == "macOS" ]; then
-            brew install libtool automake libxslt sqlite jansson libevent qt@5 sfk xmlstarlet ffmpeg
+            brew install libtool automake libxslt jansson qt@5 sfk xmlstarlet ffmpeg
             sudo pip --disable-pip-version-check install --prefix /usr/local git+https://github.com/vi/mkvparse.git
           fi
       - name: Get ZenLib info
         id: zenlib-info
         run: |
-          echo "::set-output name=hash::$(git ls-remote https://github.com/MediaArea/ZenLib.git HEAD | cut -f1)"
-          echo "::set-output name=path::$(dirname $PWD)/ZenLib"
+          echo "hash=$(git ls-remote https://github.com/MediaArea/ZenLib.git HEAD | cut -f1)" >> $GITHUB_OUTPUT
+          echo "path=$(dirname $PWD)/ZenLib" >> $GITHUB_OUTPUT
       - name: ZenLib cache
         id: zenlib-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.zenlib-info.outputs.path }}
           key: ${{ runner.os }}-ZenLib-${{ steps.zenlib-info.outputs.hash }}
@@ -52,11 +52,11 @@ jobs:
       - name: Get MediaInfoLib info
         id: mediainfolib-info
         run: |
-          echo "::set-output name=hash::$(git ls-remote https://github.com/MediaArea/MediaInfoLib.git HEAD | cut -f1)"
-          echo "::set-output name=path::$(dirname $PWD)/MediaInfoLib"
+          echo "hash=$(git ls-remote https://github.com/MediaArea/MediaInfoLib.git HEAD | cut -f1)" >> $GITHUB_OUTPUT
+          echo "path=$(dirname $PWD)/MediaInfoLib" >> $GITHUB_OUTPUT
       - name: MediaInfoLib cache
         id: mediainfolib-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.mediainfolib-info.outputs.path }}
           key: ${{ runner.os }}-MediaInfoLib-${{ steps.mediainfolib-info.outputs.hash }}
@@ -96,3 +96,155 @@ jobs:
           cd Project/Qt
           export PATH=/usr/local/opt/qt/bin:$PATH
           make
+  windows:
+    strategy:
+      matrix:
+        include:
+          - arch: Win32
+            qt_ver: 5.15
+            qt_arch: win32_msvc2019
+          - arch: x64
+            qt_ver: 5.15
+            qt_arch: win64_msvc2019_64
+      fail-fast: false
+    name: Windows (${{ matrix.arch }})
+    runs-on: windows-latest
+    steps:
+      - name: Set up Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+          modules: qtwebengine
+      - name: Get zlib info
+        id: zlib-info
+        run: |
+          ('hash=' + ((git ls-remote https://github.com/MediaArea/zlib.git HEAD) -Split "`t")[0]) | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          ('path=' + (Get-Location) + '\zlib') | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - name: zlib cache
+        id: zlib-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.zlib-info.outputs.path }}
+          key: windows-${{ matrix.arch }}-zlib-${{ steps.zlib-info.outputs.hash }}
+      - name: Checkout zlib
+        if: steps.zlib-cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: MediaArea/zlib
+          path: zlib
+      - name: Get libxml2 info
+        id: libxml2-info
+        run: |
+          ('hash=' + ((git ls-remote https://github.com/MediaArea/libxml2.git HEAD) -Split "`t")[0]) | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          ('path=' + (Get-Location) + '\libxml2') | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - name: libxml2 cache
+        id: libxml2-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.libxml2-info.outputs.path }}
+          key: windows-${{ matrix.arch }}-libxml2-${{ steps.libxml2-info.outputs.hash }}
+      - name: Checkout libxml2
+        if: steps.libxml2-cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: MediaArea/libxml2
+          path: libxml2
+      - name: Get libxslt info
+        id: libxslt-info
+        run: |
+          ('hash=' + ((git ls-remote https://github.com/MediaArea/libxslt.git HEAD) -Split "`t")[0]) | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          ('path=' + (Get-Location) + '\libxslt') | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - name: libxslt cache
+        id: libxslt-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.libxslt-info.outputs.path }}
+          key: windows-${{ matrix.arch }}-libxslt-${{ steps.libxslt-info.outputs.hash }}
+      - name: Checkout libxslt
+        if: steps.libxslt-cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: MediaArea/libxslt
+          path: libxslt
+      - name: Get libevent info
+        id: libevent-info
+        run: |
+          ('hash=' + ((git ls-remote https://github.com/MediaArea/libevent.git HEAD) -Split "`t")[0]) | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          ('path=' + (Get-Location) + '\libevent') | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - name: libevent cache
+        id: libevent-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.libevent-info.outputs.path }}
+          key: windows-${{ matrix.arch }}-libevent-${{ steps.libevent-info.outputs.hash }}
+      - name: Checkout libevent
+        if: steps.libevent-cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: MediaArea/libevent
+          path: libevent
+      - name: Get jansson info
+        id: jansson-info
+        run: |
+          ('hash=' + ((git ls-remote https://github.com/MediaArea/jansson.git HEAD) -Split "`t")[0]) | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          ('path=' + (Get-Location) + '\jansson') | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - name: jansson cache
+        id: jansson-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.jansson-info.outputs.path }}
+          key: windows-${{ matrix.arch }}-jansson-${{ steps.jansson-info.outputs.hash }}
+      - name: Checkout jansson
+        if: steps.jansson-cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: MediaArea/jansson
+          path: jansson
+      - name: Get ZenLib info
+        id: zenlib-info
+        run: |
+          ('hash=' + ((git ls-remote https://github.com/MediaArea/ZenLib.git HEAD) -Split "`t")[0]) | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          ('path=' + (Get-Location) + '\ZenLib') | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - name: ZenLib cache
+        id: zenlib-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.zenlib-info.outputs.path }}
+          key: windows-${{ matrix.arch }}-zenlib-${{ steps.zenlib-info.outputs.hash }}
+      - name: Checkout ZenLib
+        if: steps.zenlib-cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: MediaArea/ZenLib
+          path: ZenLib
+      - name: Get MediaInfoLib info
+        id: mediainfolib-info
+        run: |
+          ('hash=' + ((git ls-remote https://github.com/MediaArea/MediaInfoLib.git HEAD) -Split "`t")[0]) | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          ('path=' + (Get-Location) + '\MediaInfoLib') | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - name: MediaInfoLib cache
+        id: mediainfolib-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.mediainfolib-info.outputs.path }}
+          key: windows-${{ matrix.arch }}-mediainfolib-${{ steps.mediainfolib-info.outputs.hash }}
+      - name: Checkout MediaInfoLib
+        if: steps.mediainfolib-cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: MediaArea/MediaInfoLib
+          path: MediaInfoLib
+      - name: Checkout MediaConch
+        uses: actions/checkout@v4
+        with:
+          path: MediaConch
+      - name: Add MSBuild to PATH
+        uses: microsoft/setup-msbuild@v2
+        with:
+          msbuild-architecture: x64
+      - name: Build
+        run: |
+          $Env:IncludePath="$Env:QT_ROOT_DIR\include\QtGui;$Env:QT_ROOT_DIR\include\QtWidgets;$Env:QT_ROOT_DIR\include\QtCore;$Env:QT_ROOT_DIR\include\QtWebEngine;$Env:QT_ROOT_DIR\include\QtWebEngineWidgets;$Env:QT_ROOT_DIR\include\QtWebEngineCore;$Env:QT_ROOT_DIR\include\QtWebChannel;$Env:QT_ROOT_DIR\include;$Env:IncludePath"
+          $Env:LINK="/LIBPATH:$Env:QT_ROOT_DIR\lib"
+          MSBuild /Verbosity:Quiet /p:Configuration=Release`;Platform=${{ matrix.arch }} MediaConch\Project\MSVC2022\MediaConch.sln
diff --git a/Project/MSVC2013/CLI/MediaConch.vcxproj b/Project/MSVC2013/CLI/MediaConch.vcxproj
deleted file mode 100644
index e8b03832..00000000
--- a/Project/MSVC2013/CLI/MediaConch.vcxproj
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-CLI</ProjectName>
-    <ProjectGuid>{8A1AE679-131A-493C-86CA-91179B0955A4}</ProjectGuid>
-    <RootNamespace>MediaConch</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MediaConch</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2013\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC12\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2013\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2013\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC12\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2013\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h" />
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Config.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC12\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC12\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC12\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC12\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC12\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2013\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2013\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc12\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2013/CLI/MediaConch.vcxproj.filters b/Project/MSVC2013/CLI/MediaConch.vcxproj.filters
deleted file mode 100644
index 8e18d415..00000000
--- a/Project/MSVC2013/CLI/MediaConch.vcxproj.filters
+++ /dev/null
@@ -1,227 +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="Source Files\CLI">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\CLI">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Config.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Help.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2013/CLI/MediaConch_CLI.rc b/Project/MSVC2013/CLI/MediaConch_CLI.rc
deleted file mode 100644
index d039a4f2..00000000
--- a/Project/MSVC2013/CLI/MediaConch_CLI.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2013/GUI/MediaConch_GUI.rc b/Project/MSVC2013/GUI/MediaConch_GUI.rc
deleted file mode 100644
index c4feeef0..00000000
--- a/Project/MSVC2013/GUI/MediaConch_GUI.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-//Icons
-aaaaaaaa                        ICON "../../../Source/Resource/Image/MediaConch.ico"
diff --git a/Project/MSVC2013/GUI/MediaConch_GUI.vcxproj b/Project/MSVC2013/GUI/MediaConch_GUI.vcxproj
deleted file mode 100644
index 5cb7eb15..00000000
--- a/Project/MSVC2013/GUI/MediaConch_GUI.vcxproj
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MediaConch_GUI</RootNamespace>
-    <ProjectName>MediaConch-GUI</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtGui;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWidgets;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtCore;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebKit;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebKitWidgets;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebKitCore;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebChannel;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebKitd.lib;Qt5WebKitWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013 Kit</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtGui;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWidgets;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtCore;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKit;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKitWidgets;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKit;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKitWidgets;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKitCore;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebChannel;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebKitd.lib;Qt5WebKitWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64 Kit</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtGui;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWidgets;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtCore;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebKit;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebKitWidgets;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebKitCore;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include/QtWebChannel;..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebKit.lib;Qt5WebKitWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013 Kit</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.5-msvc2013\5.5\msvc2013 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <FunctionLevelLinking>
-      </FunctionLevelLinking>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtGui;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWidgets;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtCore;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKit;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKitWidgets;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebKitCore;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include/QtWebChannel;..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebKit.lib;Qt5WebKitWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64 Kit</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.5-msvc2013_64\5.5\msvc2013_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp" />
-    <ClCompile Include="_Automated\moc_helpwindow.cpp" />
-    <ClCompile Include="_Automated\moc_mainwindow.cpp" />
-    <ClCompile Include="_Automated\moc_progressbar.cpp" />
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp" />
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp" />
-    <ClCompile Include="_Automated\moc_WebKitView.cpp" />
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp" />
-    <ClCompile Include="_Automated\qrc_Resources.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebKitPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebKitView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-    <ClInclude Include="_Automated\ui_groupofrules.h" />
-    <ClInclude Include="_Automated\ui_mainwindow.h" />
-    <ClInclude Include="_Automated\ui_policiesmenu.h" />
-    <ClInclude Include="_Automated\ui_policiestree.h" />
-    <ClInclude Include="_Automated\ui_policymenu.h" />
-    <ClInclude Include="_Automated\ui_progressbar.h" />
-    <ClInclude Include="_Automated\ui_ruleedit.h" />
-    <ClInclude Include="_Automated\ui_rulemenu.h" />
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltruleedit.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC12\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC12\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC12\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC12\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC12\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2013\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2013\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc12\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <FileType>Document</FileType>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\License.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2013/GUI/MediaConch_GUI.vcxproj.filters b/Project/MSVC2013/GUI/MediaConch_GUI.vcxproj.filters
deleted file mode 100644
index 60361b98..00000000
--- a/Project/MSVC2013/GUI/MediaConch_GUI.vcxproj.filters
+++ /dev/null
@@ -1,553 +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="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\GUI">
-      <UniqueIdentifier>{16615b4b-f6f6-4711-b84e-0c274ffe74bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\GUI">
-      <UniqueIdentifier>{905b9726-45c0-4a7d-96c8-4a9ef9fe1873}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\_Automated">
-      <UniqueIdentifier>{4bbb3fb2-9002-40fd-8895-7484f292962a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\_Automated">
-      <UniqueIdentifier>{0346e935-23a9-493f-b58e-e8cbeee949d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Core">
-      <UniqueIdentifier>{38264c64-6e1e-4f5a-9906-a6c27769b269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Core">
-      <UniqueIdentifier>{ca9be640-a193-4ba5-a1ea-2bbea3b077f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{0d330ddd-8c38-4d7c-9944-c00240a228fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{92bd129a-a825-4860-8967-4c4af26d195b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\HTML">
-      <UniqueIdentifier>{baf09673-486b-4234-9ffe-987d6b99e130}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\UI">
-      <UniqueIdentifier>{7ec6a6e9-679b-49f4-bf60-6d1a8f2b2209}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_mainwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\qrc_Resources.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_helpwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_progressbar.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_mainwindow.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiesmenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_groupofrules.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiestree.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_ruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_rulemenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_progressbar.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebKitPage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebKitView.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <Filter>Resource Files</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\License.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2013/GUI/Post-Build.bat b/Project/MSVC2013/GUI/Post-Build.bat
deleted file mode 100644
index 1e5bcb81..00000000
--- a/Project/MSVC2013/GUI/Post-Build.bat
+++ /dev/null
@@ -1,49 +0,0 @@
-if "%3"=="" echo "Post-Build.bat Qt_Dir Output_Dir Configuration_Name" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\qmake
-) else if %3==Release (
-xcopy /D %1\bin\Qt5Core.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Quick.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Qml.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Widgets.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Gui.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5MultimediaWidgets.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Multimedia.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Sensors.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5PrintSupport.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Positioning.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5OpenGL.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5WebChannel.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5WebKit.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5WebKitWidgets.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Network.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Sql.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\icudt54.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\icuin54.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\icuuc54.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\plugins\platforms\qwindows.dll %2platforms\ | find /v "0 " || cd %CD%
-) else (
-xcopy /D %1\bin\Qt5Cored.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Quickd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Qmld.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Widgetsd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Guid.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5MultimediaWidgetsd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Multimediad.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Sensorsd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5PrintSupportd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Positioningd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5OpenGLd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5WebChanneld.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5WebKitd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5WebKitWidgetsd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Networkd.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\Qt5Sqld.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\icudt54.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\icuin54.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\bin\icuuc54.dll %2 | find /v "0 " || cd %CD%
-xcopy /D %1\plugins\platforms\qwindowsd.dll %2platforms\ | find /v "0 " || cd %CD%
-)
-
diff --git a/Project/MSVC2013/GUI/Pre-Build.bat b/Project/MSVC2013/GUI/Pre-Build.bat
deleted file mode 100644
index ed540599..00000000
--- a/Project/MSVC2013/GUI/Pre-Build.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-if "%2"=="" echo "Pre-Build.bat Qt_Dir Kit|Engine" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\qmake
-) else (
-%1\bin\qmake ..\..\Qt\MediaConch.pro USE_WEB%2=1 2> nul
-nmake /NOLOGO /f Makefile.Debug compiler_uic_make_all compiler_rcc_make_all mocables 
-)
\ No newline at end of file
diff --git a/Project/MSVC2013/MediaConch.sln b/Project/MSVC2013/MediaConch.sln
deleted file mode 100644
index 7fab3235..00000000
--- a/Project/MSVC2013/MediaConch.sln
+++ /dev/null
@@ -1,152 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{70DAF034-E8BA-4636-A42C-CC581B3ECC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-CLI", "CLI\MediaConch.vcxproj", "{8A1AE679-131A-493C-86CA-91179B0955A4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-GUI", "GUI\MediaConch_GUI.vcxproj", "{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZenLib", "..\..\..\ZenLib\Project\MSVC2013\Library\ZenLib.vcxproj", "{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoLib", "..\..\..\MediaInfoLib\Project\MSVC2013\Library\MediaInfoLib.vcxproj", "{20E0F8D6-213C-460B-B361-9C725CB375C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoDll", "..\..\..\MediaInfoLib\Project\MSVC2013\Dll\MediaInfoDll.vcxproj", "{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\libxml2\win32\VC12\libxml2.vcxproj", "{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\zlib\contrib\vstudio\vc12\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\..\..\libxslt\win32\VC12\libxslt\libxslt.vcxproj", "{F8C03828-5050-4E68-A7B4-41131F9049D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexslt", "..\..\..\libxslt\win32\VC12\libexslt\libexslt.vcxproj", "{C66B92E2-E917-4556-84D9-6D32C10C3185}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaInfo", "MediaInfo", "{363ECBF5-3630-4FFB-B713-6C4F708FC425}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jansson", "..\..\..\jansson\Contrib\VC12\Jansson\Jansson.vcxproj", "{40460A4D-243E-48DB-A2F6-F5C57ACDE134}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "..\..\..\libevent\Contrib\VC12\event\event.vcxproj", "{F687C268-C5D7-36DF-80C4-641ED9C82BC8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-Server", "Server\MediaConch-Server.vcxproj", "{66830D9C-0A1E-4664-B846-F5DAEDB574E6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.Build.0 = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.ActiveCfg = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.Build.0 = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.ActiveCfg = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.Build.0 = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.ActiveCfg = Release|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.Build.0 = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.Build.0 = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.ActiveCfg = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.Build.0 = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.ActiveCfg = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.Build.0 = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.ActiveCfg = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.Build.0 = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.Build.0 = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.ActiveCfg = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.Build.0 = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.ActiveCfg = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.Build.0 = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.ActiveCfg = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.Build.0 = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.Build.0 = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.ActiveCfg = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.Build.0 = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.ActiveCfg = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.Build.0 = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.ActiveCfg = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.Build.0 = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.Build.0 = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.ActiveCfg = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.Build.0 = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.ActiveCfg = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.Build.0 = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.ActiveCfg = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.Build.0 = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.Build.0 = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.ActiveCfg = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.Build.0 = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.ActiveCfg = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.Build.0 = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.ActiveCfg = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = ReleaseWithoutAsm|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.ActiveCfg = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.Build.0 = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.Build.0 = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.ActiveCfg = Release|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.Build.0 = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.Build.0 = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.ActiveCfg = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.Build.0 = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.ActiveCfg = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.Build.0 = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.ActiveCfg = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.Build.0 = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.Build.0 = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.ActiveCfg = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.Build.0 = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.ActiveCfg = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.Build.0 = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.ActiveCfg = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.Build.0 = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.Build.0 = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.ActiveCfg = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.Build.0 = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.ActiveCfg = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.Build.0 = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.ActiveCfg = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.Build.0 = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.Build.0 = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.ActiveCfg = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.Build.0 = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.ActiveCfg = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.Build.0 = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.ActiveCfg = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{20E0F8D6-213C-460B-B361-9C725CB375C7} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F8C03828-5050-4E68-A7B4-41131F9049D7} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{C66B92E2-E917-4556-84D9-6D32C10C3185} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-	EndGlobalSection
-EndGlobal
diff --git a/Project/MSVC2013/Server/MediaConch-Server.rc b/Project/MSVC2013/Server/MediaConch-Server.rc
deleted file mode 100644
index ceb95cb7..00000000
--- a/Project/MSVC2013/Server/MediaConch-Server.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2013/Server/MediaConch-Server.vcxproj b/Project/MSVC2013/Server/MediaConch-Server.vcxproj
deleted file mode 100644
index c57def52..00000000
--- a/Project/MSVC2013/Server/MediaConch-Server.vcxproj
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-Server</ProjectName>
-    <ProjectGuid>{66830D9C-0A1E-4664-B846-F5DAEDB574E6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2013\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC12\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2013\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC12/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2013\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2013\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC12\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2013\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC12\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC12\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC12\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC12\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC12\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2013\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2013\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc12\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2013/Server/MediaConch-Server.vcxproj.filters b/Project/MSVC2013/Server/MediaConch-Server.vcxproj.filters
deleted file mode 100644
index 96d77e89..00000000
--- a/Project/MSVC2013/Server/MediaConch-Server.vcxproj.filters
+++ /dev/null
@@ -1,227 +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="Source Files\Daemon">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Daemon">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2015/CLI/MediaConch.vcxproj b/Project/MSVC2015/CLI/MediaConch.vcxproj
deleted file mode 100644
index a356cc74..00000000
--- a/Project/MSVC2015/CLI/MediaConch.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-CLI</ProjectName>
-    <ProjectGuid>{8A1AE679-131A-493C-86CA-91179B0955A4}</ProjectGuid>
-    <RootNamespace>MediaConch</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MediaConch</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2015\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2015\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2015\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC14\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2015\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2015\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2015\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2015\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC14\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2015\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI.h" />
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h" />
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Config.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC14\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC14\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC14\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC14\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC14\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2015\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2015\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2015/CLI/MediaConch.vcxproj.filters b/Project/MSVC2015/CLI/MediaConch.vcxproj.filters
deleted file mode 100644
index 61e15dc1..00000000
--- a/Project/MSVC2015/CLI/MediaConch.vcxproj.filters
+++ /dev/null
@@ -1,347 +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="Source Files\CLI">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\CLI">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Config.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Help.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\CLI.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2015/CLI/MediaConch_CLI.rc b/Project/MSVC2015/CLI/MediaConch_CLI.rc
deleted file mode 100644
index ceb95cb7..00000000
--- a/Project/MSVC2015/CLI/MediaConch_CLI.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2015/GUI/MediaConch_GUI.rc b/Project/MSVC2015/GUI/MediaConch_GUI.rc
deleted file mode 100644
index 27a1577c..00000000
--- a/Project/MSVC2015/GUI/MediaConch_GUI.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-//Icons
-aaaaaaaa                        ICON "../../../Source/Resource/Image/MediaConch.ico"
diff --git a/Project/MSVC2015/GUI/MediaConch_GUI.vcxproj b/Project/MSVC2015/GUI/MediaConch_GUI.vcxproj
deleted file mode 100644
index 58d5b03b..00000000
--- a/Project/MSVC2015/GUI/MediaConch_GUI.vcxproj
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MediaConch_GUI</RootNamespace>
-    <ProjectName>MediaConch-GUI</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtGui;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWidgets;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtCore;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebEngine;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebEngineWidgets;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebEngineCore;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebChannel;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtGui;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWidgets;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtCore;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngine;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngine;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngineCore;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebChannel;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtGui;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWidgets;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtCore;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebEngine;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebEngineWidgets;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebEngineCore;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include/QtWebChannel;..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.6-msvc2015\5.6\msvc2015 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <FunctionLevelLinking>
-      </FunctionLevelLinking>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtGui;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWidgets;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtCore;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngine;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebEngineCore;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include/QtWebChannel;..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.6-msvc2015_64\5.6\msvc2015_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\databasewindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEnginePage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEngineView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp" />
-    <ClCompile Include="_Automated\moc_helpwindow.cpp" />
-    <ClCompile Include="_Automated\moc_mainwindow.cpp" />
-    <ClCompile Include="_Automated\moc_progressbar.cpp" />
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp" />
-    <ClCompile Include="_Automated\moc_WebEnginePage.cpp" />
-    <ClCompile Include="_Automated\moc_WebEngineView.cpp" />
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp" />
-    <ClCompile Include="_Automated\qrc_Resources.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\databasewindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEnginePage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEngineView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-    <ClInclude Include="_Automated\ui_groupofrules.h" />
-    <ClInclude Include="_Automated\ui_mainwindow.h" />
-    <ClInclude Include="_Automated\ui_policiesmenu.h" />
-    <ClInclude Include="_Automated\ui_policiestree.h" />
-    <ClInclude Include="_Automated\ui_policymenu.h" />
-    <ClInclude Include="_Automated\ui_progressbar.h" />
-    <ClInclude Include="_Automated\ui_ruleedit.h" />
-    <ClInclude Include="_Automated\ui_rulemenu.h" />
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltruleedit.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC14\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC14\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC14\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC14\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC14\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2015\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2015\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <FileType>Document</FileType>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\License.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2015/GUI/MediaConch_GUI.vcxproj.filters b/Project/MSVC2015/GUI/MediaConch_GUI.vcxproj.filters
deleted file mode 100644
index 16c9bc64..00000000
--- a/Project/MSVC2015/GUI/MediaConch_GUI.vcxproj.filters
+++ /dev/null
@@ -1,547 +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="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\GUI">
-      <UniqueIdentifier>{16615b4b-f6f6-4711-b84e-0c274ffe74bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\GUI">
-      <UniqueIdentifier>{905b9726-45c0-4a7d-96c8-4a9ef9fe1873}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\_Automated">
-      <UniqueIdentifier>{4bbb3fb2-9002-40fd-8895-7484f292962a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\_Automated">
-      <UniqueIdentifier>{0346e935-23a9-493f-b58e-e8cbeee949d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Core">
-      <UniqueIdentifier>{38264c64-6e1e-4f5a-9906-a6c27769b269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Core">
-      <UniqueIdentifier>{ca9be640-a193-4ba5-a1ea-2bbea3b077f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{0d330ddd-8c38-4d7c-9944-c00240a228fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{92bd129a-a825-4860-8967-4c4af26d195b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\HTML">
-      <UniqueIdentifier>{bff903fc-cea8-42d5-be92-5b64b7dec2dd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\UI">
-      <UniqueIdentifier>{5b729284-5077-4411-b45a-98a762cd40c3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_mainwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\qrc_Resources.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_helpwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_progressbar.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebEnginePage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebEngineView.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEnginePage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEngineView.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\databasewindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_mainwindow.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiesmenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_groupofrules.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiestree.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_ruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_rulemenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_progressbar.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEnginePage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEngineView.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\databasewindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <Filter>Resource Files</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\License.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2015/GUI/Post-Build.bat b/Project/MSVC2015/GUI/Post-Build.bat
deleted file mode 100644
index e7363d29..00000000
--- a/Project/MSVC2015/GUI/Post-Build.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-if "%2"=="" echo "Post-Build.bat Qt_Dir Output_Dir" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\windeployqt
-) else (
-%1\bin\windeployqt %2
-)
diff --git a/Project/MSVC2015/GUI/Pre-Build.bat b/Project/MSVC2015/GUI/Pre-Build.bat
deleted file mode 100644
index ed540599..00000000
--- a/Project/MSVC2015/GUI/Pre-Build.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-if "%2"=="" echo "Pre-Build.bat Qt_Dir Kit|Engine" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\qmake
-) else (
-%1\bin\qmake ..\..\Qt\MediaConch.pro USE_WEB%2=1 2> nul
-nmake /NOLOGO /f Makefile.Debug compiler_uic_make_all compiler_rcc_make_all mocables 
-)
\ No newline at end of file
diff --git a/Project/MSVC2015/MediaConch.sln b/Project/MSVC2015/MediaConch.sln
deleted file mode 100644
index 9e9db960..00000000
--- a/Project/MSVC2015/MediaConch.sln
+++ /dev/null
@@ -1,152 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{70DAF034-E8BA-4636-A42C-CC581B3ECC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-CLI", "CLI\MediaConch.vcxproj", "{8A1AE679-131A-493C-86CA-91179B0955A4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-GUI", "GUI\MediaConch_GUI.vcxproj", "{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZenLib", "..\..\..\ZenLib\Project\MSVC2015\Library\ZenLib.vcxproj", "{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoLib", "..\..\..\MediaInfoLib\Project\MSVC2015\Library\MediaInfoLib.vcxproj", "{20E0F8D6-213C-460B-B361-9C725CB375C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoDll", "..\..\..\MediaInfoLib\Project\MSVC2015\Dll\MediaInfoDll.vcxproj", "{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\libxml2\win32\VC14\libxml2.vcxproj", "{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\..\..\libxslt\win32\VC14\libxslt\libxslt.vcxproj", "{F8C03828-5050-4E68-A7B4-41131F9049D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexslt", "..\..\..\libxslt\win32\VC14\libexslt\libexslt.vcxproj", "{C66B92E2-E917-4556-84D9-6D32C10C3185}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaInfo", "MediaInfo", "{363ECBF5-3630-4FFB-B713-6C4F708FC425}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "..\..\..\libevent\Contrib\VC14\event\event.vcxproj", "{F687C268-C5D7-36DF-80C4-641ED9C82BC8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jansson", "..\..\..\jansson\Contrib\VC14\Jansson\Jansson.vcxproj", "{40460A4D-243E-48DB-A2F6-F5C57ACDE134}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-Server", "Server\MediaConch-Server.vcxproj", "{66830D9C-0A1E-4664-B846-F5DAEDB574E6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.Build.0 = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.ActiveCfg = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.Build.0 = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.ActiveCfg = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.Build.0 = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.ActiveCfg = Release|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.Build.0 = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.Build.0 = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.ActiveCfg = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.Build.0 = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.ActiveCfg = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.Build.0 = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.ActiveCfg = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.Build.0 = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.Build.0 = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.ActiveCfg = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.Build.0 = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.ActiveCfg = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.Build.0 = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.ActiveCfg = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.Build.0 = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.Build.0 = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.ActiveCfg = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.Build.0 = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.ActiveCfg = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.Build.0 = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.ActiveCfg = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.Build.0 = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.Build.0 = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.ActiveCfg = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.Build.0 = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.ActiveCfg = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.Build.0 = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.ActiveCfg = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.Build.0 = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.Build.0 = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.ActiveCfg = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.Build.0 = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.ActiveCfg = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.Build.0 = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.ActiveCfg = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = ReleaseWithoutAsm|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.ActiveCfg = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.Build.0 = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.Build.0 = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.ActiveCfg = Release|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.Build.0 = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.Build.0 = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.ActiveCfg = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.Build.0 = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.ActiveCfg = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.Build.0 = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.ActiveCfg = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.Build.0 = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.Build.0 = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.ActiveCfg = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.Build.0 = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.ActiveCfg = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.Build.0 = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.ActiveCfg = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.Build.0 = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.Build.0 = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.ActiveCfg = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.Build.0 = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.ActiveCfg = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.Build.0 = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.ActiveCfg = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.Build.0 = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.Build.0 = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.ActiveCfg = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.Build.0 = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.ActiveCfg = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.Build.0 = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.ActiveCfg = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{20E0F8D6-213C-460B-B361-9C725CB375C7} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F8C03828-5050-4E68-A7B4-41131F9049D7} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{C66B92E2-E917-4556-84D9-6D32C10C3185} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-	EndGlobalSection
-EndGlobal
diff --git a/Project/MSVC2015/Server/MediaConch-Server.rc b/Project/MSVC2015/Server/MediaConch-Server.rc
deleted file mode 100644
index ceb95cb7..00000000
--- a/Project/MSVC2015/Server/MediaConch-Server.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2015/Server/MediaConch-Server.vcxproj b/Project/MSVC2015/Server/MediaConch-Server.vcxproj
deleted file mode 100644
index 0e6fe2db..00000000
--- a/Project/MSVC2015/Server/MediaConch-Server.vcxproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-Server</ProjectName>
-    <ProjectGuid>{66830D9C-0A1E-4664-B846-F5DAEDB574E6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC14/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC14\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC14\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC14\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC14\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC14\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2015\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2015\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2015/Server/MediaConch-Server.vcxproj.filters b/Project/MSVC2015/Server/MediaConch-Server.vcxproj.filters
deleted file mode 100644
index 94135614..00000000
--- a/Project/MSVC2015/Server/MediaConch-Server.vcxproj.filters
+++ /dev/null
@@ -1,338 +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="Source Files\Daemon">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Daemon">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2017/CLI/MediaConch.vcxproj b/Project/MSVC2017/CLI/MediaConch.vcxproj
deleted file mode 100644
index cd3708b8..00000000
--- a/Project/MSVC2017/CLI/MediaConch.vcxproj
+++ /dev/null
@@ -1,314 +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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-CLI</ProjectName>
-    <ProjectGuid>{8A1AE679-131A-493C-86CA-91179B0955A4}</ProjectGuid>
-    <RootNamespace>MediaConch</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MediaConch</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2017\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2017\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2017\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC15\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2017\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2017\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2017\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2017\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC15\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2017\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI.h" />
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h" />
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Config.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC15\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC15\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC15\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC15\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC15\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2017\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2017\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc15\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2017/CLI/MediaConch.vcxproj.filters b/Project/MSVC2017/CLI/MediaConch.vcxproj.filters
deleted file mode 100644
index 61e15dc1..00000000
--- a/Project/MSVC2017/CLI/MediaConch.vcxproj.filters
+++ /dev/null
@@ -1,347 +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="Source Files\CLI">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\CLI">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Config.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Help.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\CLI.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2017/CLI/MediaConch_CLI.rc b/Project/MSVC2017/CLI/MediaConch_CLI.rc
deleted file mode 100644
index ceb95cb7..00000000
--- a/Project/MSVC2017/CLI/MediaConch_CLI.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2017/GUI/MediaConch_GUI.rc b/Project/MSVC2017/GUI/MediaConch_GUI.rc
deleted file mode 100644
index 27a1577c..00000000
--- a/Project/MSVC2017/GUI/MediaConch_GUI.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-//Icons
-aaaaaaaa                        ICON "../../../Source/Resource/Image/MediaConch.ico"
diff --git a/Project/MSVC2017/GUI/MediaConch_GUI.vcxproj b/Project/MSVC2017/GUI/MediaConch_GUI.vcxproj
deleted file mode 100644
index 634ec60f..00000000
--- a/Project/MSVC2017/GUI/MediaConch_GUI.vcxproj
+++ /dev/null
@@ -1,418 +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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MediaConch_GUI</RootNamespace>
-    <ProjectName>MediaConch-GUI</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtGui;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtGui;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtGui;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <FunctionLevelLinking>
-      </FunctionLevelLinking>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtGui;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\databasewindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEnginePage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEngineView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp" />
-    <ClCompile Include="_Automated\moc_helpwindow.cpp" />
-    <ClCompile Include="_Automated\moc_mainwindow.cpp" />
-    <ClCompile Include="_Automated\moc_progressbar.cpp" />
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp" />
-    <ClCompile Include="_Automated\moc_WebEnginePage.cpp" />
-    <ClCompile Include="_Automated\moc_WebEngineView.cpp" />
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp" />
-    <ClCompile Include="_Automated\qrc_Resources.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\databasewindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEnginePage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEngineView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-    <ClInclude Include="_Automated\ui_groupofrules.h" />
-    <ClInclude Include="_Automated\ui_mainwindow.h" />
-    <ClInclude Include="_Automated\ui_policiesmenu.h" />
-    <ClInclude Include="_Automated\ui_policiestree.h" />
-    <ClInclude Include="_Automated\ui_policymenu.h" />
-    <ClInclude Include="_Automated\ui_progressbar.h" />
-    <ClInclude Include="_Automated\ui_ruleedit.h" />
-    <ClInclude Include="_Automated\ui_rulemenu.h" />
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltruleedit.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC15\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC15\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC15\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC15\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC15\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2017\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2017\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc15\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <FileType>Document</FileType>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\License.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2017/GUI/MediaConch_GUI.vcxproj.filters b/Project/MSVC2017/GUI/MediaConch_GUI.vcxproj.filters
deleted file mode 100644
index 16c9bc64..00000000
--- a/Project/MSVC2017/GUI/MediaConch_GUI.vcxproj.filters
+++ /dev/null
@@ -1,547 +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="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\GUI">
-      <UniqueIdentifier>{16615b4b-f6f6-4711-b84e-0c274ffe74bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\GUI">
-      <UniqueIdentifier>{905b9726-45c0-4a7d-96c8-4a9ef9fe1873}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\_Automated">
-      <UniqueIdentifier>{4bbb3fb2-9002-40fd-8895-7484f292962a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\_Automated">
-      <UniqueIdentifier>{0346e935-23a9-493f-b58e-e8cbeee949d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Core">
-      <UniqueIdentifier>{38264c64-6e1e-4f5a-9906-a6c27769b269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Core">
-      <UniqueIdentifier>{ca9be640-a193-4ba5-a1ea-2bbea3b077f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{0d330ddd-8c38-4d7c-9944-c00240a228fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{92bd129a-a825-4860-8967-4c4af26d195b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\HTML">
-      <UniqueIdentifier>{bff903fc-cea8-42d5-be92-5b64b7dec2dd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\UI">
-      <UniqueIdentifier>{5b729284-5077-4411-b45a-98a762cd40c3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_mainwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\qrc_Resources.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_helpwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_progressbar.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebEnginePage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebEngineView.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEnginePage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEngineView.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\databasewindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_mainwindow.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiesmenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_groupofrules.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiestree.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_ruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_rulemenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_progressbar.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEnginePage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEngineView.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\databasewindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <Filter>Resource Files</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\License.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2017/GUI/Post-Build.bat b/Project/MSVC2017/GUI/Post-Build.bat
deleted file mode 100644
index 7070eae1..00000000
--- a/Project/MSVC2017/GUI/Post-Build.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-if "%2"=="" echo "Post-Build.bat Qt_Dir Output_Dir" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\windeployqt
-) else (
-%1\bin\windeployqt --release %2
-)
diff --git a/Project/MSVC2017/GUI/Pre-Build.bat b/Project/MSVC2017/GUI/Pre-Build.bat
deleted file mode 100644
index 4828e8b6..00000000
--- a/Project/MSVC2017/GUI/Pre-Build.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-if "%2"=="" echo "Pre-Build.bat Qt_Dir Kit|Engine" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\qmake
-) else (
-%1\bin\qmake ..\..\Qt\MediaConch.pro USE_WEB%2=1 2> nul
-nmake /NOLOGO /f Makefile.Release compiler_uic_make_all compiler_rcc_make_all mocables 
-)
\ No newline at end of file
diff --git a/Project/MSVC2017/MediaConch.sln b/Project/MSVC2017/MediaConch.sln
deleted file mode 100644
index ff3fae8a..00000000
--- a/Project/MSVC2017/MediaConch.sln
+++ /dev/null
@@ -1,152 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{70DAF034-E8BA-4636-A42C-CC581B3ECC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-CLI", "CLI\MediaConch.vcxproj", "{8A1AE679-131A-493C-86CA-91179B0955A4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-GUI", "GUI\MediaConch_GUI.vcxproj", "{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZenLib", "..\..\..\ZenLib\Project\MSVC2017\Library\ZenLib.vcxproj", "{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoLib", "..\..\..\MediaInfoLib\Project\MSVC2017\Library\MediaInfoLib.vcxproj", "{20E0F8D6-213C-460B-B361-9C725CB375C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoDll", "..\..\..\MediaInfoLib\Project\MSVC2017\Dll\MediaInfoDll.vcxproj", "{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\libxml2\win32\VC15\libxml2.vcxproj", "{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\zlib\contrib\vstudio\vc15\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\..\..\libxslt\win32\VC15\libxslt\libxslt.vcxproj", "{F8C03828-5050-4E68-A7B4-41131F9049D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexslt", "..\..\..\libxslt\win32\VC15\libexslt\libexslt.vcxproj", "{C66B92E2-E917-4556-84D9-6D32C10C3185}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaInfo", "MediaInfo", "{363ECBF5-3630-4FFB-B713-6C4F708FC425}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "..\..\..\libevent\Contrib\VC15\event\event.vcxproj", "{F687C268-C5D7-36DF-80C4-641ED9C82BC8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jansson", "..\..\..\jansson\Contrib\VC15\Jansson\Jansson.vcxproj", "{40460A4D-243E-48DB-A2F6-F5C57ACDE134}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-Server", "Server\MediaConch-Server.vcxproj", "{66830D9C-0A1E-4664-B846-F5DAEDB574E6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.Build.0 = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.ActiveCfg = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.Build.0 = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.ActiveCfg = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.Build.0 = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.ActiveCfg = Release|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.Build.0 = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.Build.0 = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.ActiveCfg = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.Build.0 = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.ActiveCfg = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.Build.0 = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.ActiveCfg = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.Build.0 = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.Build.0 = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.ActiveCfg = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.Build.0 = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.ActiveCfg = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.Build.0 = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.ActiveCfg = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.Build.0 = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.Build.0 = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.ActiveCfg = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.Build.0 = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.ActiveCfg = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.Build.0 = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.ActiveCfg = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.Build.0 = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.Build.0 = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.ActiveCfg = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.Build.0 = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.ActiveCfg = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.Build.0 = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.ActiveCfg = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.Build.0 = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.Build.0 = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.ActiveCfg = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.Build.0 = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.ActiveCfg = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.Build.0 = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.ActiveCfg = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = ReleaseWithoutAsm|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.ActiveCfg = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.Build.0 = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.Build.0 = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.ActiveCfg = Release|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.Build.0 = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.Build.0 = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.ActiveCfg = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.Build.0 = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.ActiveCfg = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.Build.0 = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.ActiveCfg = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.Build.0 = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.Build.0 = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.ActiveCfg = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.Build.0 = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.ActiveCfg = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.Build.0 = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.ActiveCfg = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.Build.0 = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.Build.0 = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.ActiveCfg = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.Build.0 = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.ActiveCfg = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.Build.0 = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.ActiveCfg = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.Build.0 = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.Build.0 = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.ActiveCfg = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.Build.0 = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.ActiveCfg = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.Build.0 = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.ActiveCfg = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{20E0F8D6-213C-460B-B361-9C725CB375C7} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F8C03828-5050-4E68-A7B4-41131F9049D7} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{C66B92E2-E917-4556-84D9-6D32C10C3185} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-	EndGlobalSection
-EndGlobal
diff --git a/Project/MSVC2017/Server/MediaConch-Server.rc b/Project/MSVC2017/Server/MediaConch-Server.rc
deleted file mode 100644
index ceb95cb7..00000000
--- a/Project/MSVC2017/Server/MediaConch-Server.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2017/Server/MediaConch-Server.vcxproj b/Project/MSVC2017/Server/MediaConch-Server.vcxproj
deleted file mode 100644
index d0a286e9..00000000
--- a/Project/MSVC2017/Server/MediaConch-Server.vcxproj
+++ /dev/null
@@ -1,306 +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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-Server</ProjectName>
-    <ProjectGuid>{66830D9C-0A1E-4664-B846-F5DAEDB574E6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC15/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC15\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC15\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC15\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC15\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC15\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2017\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2017\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc15\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2017/Server/MediaConch-Server.vcxproj.filters b/Project/MSVC2017/Server/MediaConch-Server.vcxproj.filters
deleted file mode 100644
index 94135614..00000000
--- a/Project/MSVC2017/Server/MediaConch-Server.vcxproj.filters
+++ /dev/null
@@ -1,338 +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="Source Files\Daemon">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Daemon">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2019/CLI/MediaConch.vcxproj b/Project/MSVC2019/CLI/MediaConch.vcxproj
deleted file mode 100644
index b430cc0b..00000000
--- a/Project/MSVC2019/CLI/MediaConch.vcxproj
+++ /dev/null
@@ -1,314 +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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-CLI</ProjectName>
-    <ProjectGuid>{8A1AE679-131A-493C-86CA-91179B0955A4}</ProjectGuid>
-    <RootNamespace>MediaConch</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MediaConch</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MediaConch</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2019\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2019\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2019\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC16\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2019\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2019\$(Platform)\$(Configuration);..\..\..\..\MediaInfoLib\Project\MSVC2019\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2019\Library\$(Platform)\$(Configuration);..\..\..\..\libxslt\win32\libxslt\$(Platform)\$(Configuration);..\..\..\..\libxml2\win32\VC16\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2019\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp" />
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI.h" />
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h" />
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Config.h" />
-    <ClInclude Include="..\..\..\Source\CLI\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC16\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC16\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC16\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC16\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC16\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2019\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2019\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc16\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/Project/MSVC2019/CLI/MediaConch.vcxproj.filters b/Project/MSVC2019/CLI/MediaConch.vcxproj.filters
deleted file mode 100644
index 61e15dc1..00000000
--- a/Project/MSVC2019/CLI/MediaConch.vcxproj.filters
+++ /dev/null
@@ -1,347 +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="Source Files\CLI">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\CLI">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CommandLine_Parser.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\Help.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\CLI\CLI.cpp">
-      <Filter>Source Files\CLI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\CLI\CLI_Main.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\CommandLine_Parser.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Config.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\Help.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\CLI\CLI.h">
-      <Filter>Header Files\CLI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_CLI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2019/CLI/MediaConch_CLI.rc b/Project/MSVC2019/CLI/MediaConch_CLI.rc
deleted file mode 100644
index ceb95cb7..00000000
--- a/Project/MSVC2019/CLI/MediaConch_CLI.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2019/GUI/MediaConch_GUI.rc b/Project/MSVC2019/GUI/MediaConch_GUI.rc
deleted file mode 100644
index 27a1577c..00000000
--- a/Project/MSVC2019/GUI/MediaConch_GUI.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-//Icons
-aaaaaaaa                        ICON "../../../Source/Resource/Image/MediaConch.ico"
diff --git a/Project/MSVC2019/GUI/MediaConch_GUI.vcxproj b/Project/MSVC2019/GUI/MediaConch_GUI.vcxproj
deleted file mode 100644
index 3a3e1c81..00000000
--- a/Project/MSVC2019/GUI/MediaConch_GUI.vcxproj
+++ /dev/null
@@ -1,418 +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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MediaConch_GUI</RootNamespace>
-    <ProjectName>MediaConch-GUI</ProjectName>
-  </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)'=='Debug|x64'" 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>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtGui;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtGui;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtGui;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <FunctionLevelLinking>
-      </FunctionLevelLinking>
-      <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtGui;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 Engine</Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 $(OutDir) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\databasewindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEnginePage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEngineView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp" />
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp" />
-    <ClCompile Include="_Automated\moc_helpwindow.cpp" />
-    <ClCompile Include="_Automated\moc_mainwindow.cpp" />
-    <ClCompile Include="_Automated\moc_progressbar.cpp" />
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp" />
-    <ClCompile Include="_Automated\moc_WebEnginePage.cpp" />
-    <ClCompile Include="_Automated\moc_WebEngineView.cpp" />
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp" />
-    <ClCompile Include="_Automated\qrc_Resources.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\databasewindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEnginePage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEngineView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h" />
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-    <ClInclude Include="_Automated\ui_groupofrules.h" />
-    <ClInclude Include="_Automated\ui_mainwindow.h" />
-    <ClInclude Include="_Automated\ui_policiesmenu.h" />
-    <ClInclude Include="_Automated\ui_policiestree.h" />
-    <ClInclude Include="_Automated\ui_policymenu.h" />
-    <ClInclude Include="_Automated\ui_progressbar.h" />
-    <ClInclude Include="_Automated\ui_ruleedit.h" />
-    <ClInclude Include="_Automated\ui_rulemenu.h" />
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h" />
-    <ClInclude Include="_Automated\ui_xsltruleedit.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC16\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC16\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC16\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC16\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC16\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2019\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2019\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc16\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <FileType>Document</FileType>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <FileType>Document</FileType>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\License.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html" />
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/Project/MSVC2019/GUI/MediaConch_GUI.vcxproj.filters b/Project/MSVC2019/GUI/MediaConch_GUI.vcxproj.filters
deleted file mode 100644
index 16c9bc64..00000000
--- a/Project/MSVC2019/GUI/MediaConch_GUI.vcxproj.filters
+++ /dev/null
@@ -1,547 +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="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\GUI">
-      <UniqueIdentifier>{16615b4b-f6f6-4711-b84e-0c274ffe74bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\GUI">
-      <UniqueIdentifier>{905b9726-45c0-4a7d-96c8-4a9ef9fe1873}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\_Automated">
-      <UniqueIdentifier>{4bbb3fb2-9002-40fd-8895-7484f292962a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\_Automated">
-      <UniqueIdentifier>{0346e935-23a9-493f-b58e-e8cbeee949d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Core">
-      <UniqueIdentifier>{38264c64-6e1e-4f5a-9906-a6c27769b269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Core">
-      <UniqueIdentifier>{ca9be640-a193-4ba5-a1ea-2bbea3b077f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{0d330ddd-8c38-4d7c-9944-c00240a228fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{92bd129a-a825-4860-8967-4c4af26d195b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\HTML">
-      <UniqueIdentifier>{bff903fc-cea8-42d5-be92-5b64b7dec2dd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\UI">
-      <UniqueIdentifier>{5b729284-5077-4411-b45a-98a762cd40c3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch_GUI.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\mainwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\main.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_mainwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\qrc_Resources.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\policieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\checkerwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\settingswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\helpwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_helpwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\progressbar.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_progressbar.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebEnginePage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebEngineView.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEnginePage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebEngineView.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebKitView.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_workerfiles.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\resulttable.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\DatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\NoDatabaseUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\SQLLiteUi.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\uisettings.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\displaywindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\WebCommonPage.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_WebCommonPage.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\commonwebwindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="_Automated\moc_commonwebwindow.cpp">
-      <Filter>Source Files\_Automated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\GUI\Qt\databasewindow.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\mainwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_mainwindow.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiesmenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_groupofrules.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policiestree.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_policymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_ruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_rulemenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\checkerwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\settingswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\policieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_xsltruleedit.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\helpwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\progressbar.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_progressbar.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebView.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEnginePage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebEngineView.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebChoose.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="_Automated\ui_unknownpolicymenu.h">
-      <Filter>Header Files\_Automated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\workerfiles.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\resulttable.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\DatabaseUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\SQLLiteUi.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\displaywindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\WebCommonPage.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\publicpolicieswindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\commonwebwindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\GUI\Qt\databasewindow.h">
-      <Filter>Header Files\GUI</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\Source\Resource\Resources.qrc">
-      <Filter>Resource Files</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\FAQ\FAQ.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\Data Format\Data Format.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\mainwindow.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\GUI\Qt\progressbar.ui">
-      <Filter>Resource Files\UI</Filter>
-    </Xml>
-    <Xml Include="..\..\..\Source\Resource\html\Help\How To Use\How To Use.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-    <Xml Include="..\..\..\License.html">
-      <Filter>Resource Files\HTML</Filter>
-    </Xml>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2019/GUI/Post-Build.bat b/Project/MSVC2019/GUI/Post-Build.bat
deleted file mode 100644
index 7070eae1..00000000
--- a/Project/MSVC2019/GUI/Post-Build.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-if "%2"=="" echo "Post-Build.bat Qt_Dir Output_Dir" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\windeployqt
-) else (
-%1\bin\windeployqt --release %2
-)
diff --git a/Project/MSVC2019/GUI/Pre-Build.bat b/Project/MSVC2019/GUI/Pre-Build.bat
deleted file mode 100644
index 4828e8b6..00000000
--- a/Project/MSVC2019/GUI/Pre-Build.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-if "%2"=="" echo "Pre-Build.bat Qt_Dir Kit|Engine" | find /v "0 "
-
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\qmake
-) else (
-%1\bin\qmake ..\..\Qt\MediaConch.pro USE_WEB%2=1 2> nul
-nmake /NOLOGO /f Makefile.Release compiler_uic_make_all compiler_rcc_make_all mocables 
-)
\ No newline at end of file
diff --git a/Project/MSVC2019/MediaConch.sln b/Project/MSVC2019/MediaConch.sln
deleted file mode 100644
index 1c885123..00000000
--- a/Project/MSVC2019/MediaConch.sln
+++ /dev/null
@@ -1,152 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{70DAF034-E8BA-4636-A42C-CC581B3ECC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-CLI", "CLI\MediaConch.vcxproj", "{8A1AE679-131A-493C-86CA-91179B0955A4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-GUI", "GUI\MediaConch_GUI.vcxproj", "{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZenLib", "..\..\..\ZenLib\Project\MSVC2019\Library\ZenLib.vcxproj", "{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoLib", "..\..\..\MediaInfoLib\Project\MSVC2019\Library\MediaInfoLib.vcxproj", "{20E0F8D6-213C-460B-B361-9C725CB375C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfoDll", "..\..\..\MediaInfoLib\Project\MSVC2019\Dll\MediaInfoDll.vcxproj", "{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\libxml2\win32\VC16\libxml2.vcxproj", "{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\zlib\contrib\vstudio\vc16\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\..\..\libxslt\win32\VC16\libxslt\libxslt.vcxproj", "{F8C03828-5050-4E68-A7B4-41131F9049D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexslt", "..\..\..\libxslt\win32\VC16\libexslt\libexslt.vcxproj", "{C66B92E2-E917-4556-84D9-6D32C10C3185}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaInfo", "MediaInfo", "{363ECBF5-3630-4FFB-B713-6C4F708FC425}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "..\..\..\libevent\Contrib\VC16\event\event.vcxproj", "{F687C268-C5D7-36DF-80C4-641ED9C82BC8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jansson", "..\..\..\jansson\Contrib\VC16\Jansson\Jansson.vcxproj", "{40460A4D-243E-48DB-A2F6-F5C57ACDE134}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaConch-Server", "Server\MediaConch-Server.vcxproj", "{66830D9C-0A1E-4664-B846-F5DAEDB574E6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|Win32.Build.0 = Debug|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.ActiveCfg = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Debug|x64.Build.0 = Debug|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.ActiveCfg = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|Win32.Build.0 = Release|Win32
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.ActiveCfg = Release|x64
-		{8A1AE679-131A-493C-86CA-91179B0955A4}.Release|x64.Build.0 = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|Win32.Build.0 = Debug|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.ActiveCfg = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Debug|x64.Build.0 = Debug|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.ActiveCfg = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|Win32.Build.0 = Release|Win32
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.ActiveCfg = Release|x64
-		{2D3D1642-D55D-4EF6-AEC8-B8E1B8F8B226}.Release|x64.Build.0 = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|Win32.Build.0 = Debug|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.ActiveCfg = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Debug|x64.Build.0 = Debug|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.ActiveCfg = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|Win32.Build.0 = Release|Win32
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.ActiveCfg = Release|x64
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}.Release|x64.Build.0 = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|Win32.Build.0 = Debug|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.ActiveCfg = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Debug|x64.Build.0 = Debug|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.ActiveCfg = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|Win32.Build.0 = Release|Win32
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.ActiveCfg = Release|x64
-		{20E0F8D6-213C-460B-B361-9C725CB375C7}.Release|x64.Build.0 = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|Win32.Build.0 = Debug|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.ActiveCfg = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Debug|x64.Build.0 = Debug|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.ActiveCfg = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|Win32.Build.0 = Release|Win32
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.ActiveCfg = Release|x64
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}.Release|x64.Build.0 = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.Build.0 = Debug|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.ActiveCfg = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.Build.0 = Debug|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.ActiveCfg = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.Build.0 = Release|Win32
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.ActiveCfg = Release|x64
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = ReleaseWithoutAsm|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.ActiveCfg = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Debug|x64.Build.0 = Debug|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|Win32.Build.0 = Release|Win32
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.ActiveCfg = Release|x64
-		{F8C03828-5050-4E68-A7B4-41131F9049D7}.Release|x64.Build.0 = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|Win32.Build.0 = Debug|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.ActiveCfg = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Debug|x64.Build.0 = Debug|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.ActiveCfg = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|Win32.Build.0 = Release|Win32
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.ActiveCfg = Release|x64
-		{C66B92E2-E917-4556-84D9-6D32C10C3185}.Release|x64.Build.0 = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|Win32.Build.0 = Debug|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.ActiveCfg = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Debug|x64.Build.0 = Debug|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.ActiveCfg = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|Win32.Build.0 = Release|Win32
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.ActiveCfg = Release|x64
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8}.Release|x64.Build.0 = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|Win32.Build.0 = Debug|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.ActiveCfg = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Debug|x64.Build.0 = Debug|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.ActiveCfg = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|Win32.Build.0 = Release|Win32
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.ActiveCfg = Release|x64
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134}.Release|x64.Build.0 = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|Win32.Build.0 = Debug|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.ActiveCfg = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Debug|x64.Build.0 = Debug|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.ActiveCfg = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|Win32.Build.0 = Release|Win32
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.ActiveCfg = Release|x64
-		{66830D9C-0A1E-4664-B846-F5DAEDB574E6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{20E0F8D6-213C-460B-B361-9C725CB375C7} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5} = {363ECBF5-3630-4FFB-B713-6C4F708FC425}
-		{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F8C03828-5050-4E68-A7B4-41131F9049D7} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{C66B92E2-E917-4556-84D9-6D32C10C3185} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{F687C268-C5D7-36DF-80C4-641ED9C82BC8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-		{40460A4D-243E-48DB-A2F6-F5C57ACDE134} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
-	EndGlobalSection
-EndGlobal
diff --git a/Project/MSVC2019/Server/MediaConch-Server.rc b/Project/MSVC2019/Server/MediaConch-Server.rc
deleted file mode 100644
index ceb95cb7..00000000
--- a/Project/MSVC2019/Server/MediaConch-Server.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,06,0,0
- PRODUCTVERSION 24,06,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "24.06.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
-            VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "24.06.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/MSVC2019/Server/MediaConch-Server.vcxproj b/Project/MSVC2019/Server/MediaConch-Server.vcxproj
deleted file mode 100644
index b6ab6bed..00000000
--- a/Project/MSVC2019/Server/MediaConch-Server.vcxproj
+++ /dev/null
@@ -1,306 +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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>MediaConch-Server</ProjectName>
-    <ProjectGuid>{66830D9C-0A1E-4664-B846-F5DAEDB574E6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <OmitFramePointers>true</OmitFramePointers>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC16/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\jansson\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_JANSSON;HAVE_LIBEVENT;HAVE_SQLITE;LIBEXSLT_STATIC;LIBXSLT_STATIC;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <SetChecksum>true</SetChecksum>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\IMSC1.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp" />
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp" />
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
-    <ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
-    <ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h" />
-    <ClInclude Include="..\..\..\Source\Common\Container.h" />
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h" />
-    <ClInclude Include="..\..\..\Source\Common\Database.h" />
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\IMSC1.h" />
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\St205212010smpteTtXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1AnimationXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ContentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1CoreAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DatatypesXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1DocumentXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1HeadXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1LayoutXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1MetadataXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParameterItemsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ParametersXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1ProfileXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1StylingXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1TimingAttribsXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\Ttml1Xsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\TtmlWrapperXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\generated\XmlXsd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Http.h" />
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\Json.h" />
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h" />
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h" />
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h" />
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h" />
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Queue.h" />
-    <ClInclude Include="..\..\..\Source\Common\Reports.h" />
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h" />
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h" />
-    <ClInclude Include="..\..\..\Source\Common\Schema.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h" />
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h" />
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h" />
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h" />
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h" />
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h" />
-    <ClInclude Include="..\..\..\Source\Common\Core.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policies.h" />
-    <ClInclude Include="..\..\..\Source\Common\Policy.h" />
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Checker.h" />
-    <ClInclude Include="..\..\..\Source\Checker\Path.h" />
-    <ClInclude Include="..\..\..\Source\IMSC1\IMSC1Plugin.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.h" />
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\jansson\Contrib\VC16\Jansson\Jansson.vcxproj">
-      <Project>{40460a4d-243e-48db-a2f6-f5c57acde134}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libevent\Contrib\VC16\event\event.vcxproj">
-      <Project>{f687c268-c5d7-36df-80c4-641ed9c82bc8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxml2\win32\VC16\libxml2.vcxproj">
-      <Project>{1d6039f6-5078-416f-a3af-a36efc7e6a1c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC16\libexslt\libexslt.vcxproj">
-      <Project>{c66b92e2-e917-4556-84d9-6d32c10c3185}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libxslt\win32\VC16\libxslt\libxslt.vcxproj">
-      <Project>{f8c03828-5050-4e68-a7b4-41131f9049d7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2019\Library\MediaInfoLib.vcxproj">
-      <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2019\Library\ZenLib.vcxproj">
-      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\contrib\vstudio\vc16\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/Project/MSVC2019/Server/MediaConch-Server.vcxproj.filters b/Project/MSVC2019/Server/MediaConch-Server.vcxproj.filters
deleted file mode 100644
index 94135614..00000000
--- a/Project/MSVC2019/Server/MediaConch-Server.vcxproj.filters
+++ /dev/null
@@ -1,338 +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="Source Files\Daemon">
-      <UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Daemon">
-      <UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ThirdParty">
-      <UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ThirdParty\sqlite">
-      <UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon_Main.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Daemon.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Daemon\Help.cpp">
-      <Filter>Source Files\Daemon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Core.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Schema.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Policies.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Database.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Http.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Json.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Queue.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Common\Reports.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon_Main.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Daemon.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Daemon\Help.h">
-      <Filter>Header Files\Daemon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Core.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policies.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Policy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
-      <Filter>ThirdParty\sqlite</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DpfManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Plugin.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Database.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLite.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Configuration.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Container.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Http.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Httpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Json.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\NoContainer.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginLog.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Queue.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\REST_API.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Scheduler.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Schema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Xslt.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Common\Reports.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MediaConch-Server.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Project/MSVC2022/GUI/MediaConch_GUI.vcxproj b/Project/MSVC2022/GUI/MediaConch_GUI.vcxproj
index 0b452bc4..e5e49f52 100644
--- a/Project/MSVC2022/GUI/MediaConch_GUI.vcxproj
+++ b/Project/MSVC2022/GUI/MediaConch_GUI.vcxproj
@@ -78,47 +78,45 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtGui;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 Engine</Command>
+      <Command>Pre-Build.bat Engine</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 $(OutDir) $(Configuration)</Command>
+      <Command>Post-Build.bat $(OutDir) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtGui;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Xmld.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5WebChanneld.lib;Qt5WebEngined.lib;Qt5WebEngineWidgetsd.lib;qtmaind.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 Engine</Command>
+      <Command>Pre-Build.bat Engine</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 $(OutDir) $(Configuration)</Command>
+      <Command>Post-Build.bat $(OutDir) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtGui;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DebugInformationFormat>None</DebugInformationFormat>
@@ -128,14 +126,13 @@
       <GenerateDebugInformation>No</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017\lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 Engine</Command>
+      <Command>Pre-Build.bat Engine</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017\5.9\msvc2017 $(OutDir) $(Configuration)</Command>
+      <Command>Post-Build.bat $(OutDir) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -145,7 +142,7 @@
       <PreprocessorDefinitions>LIBXML_STATIC;LIBXSLT_STATIC;LIBEXSLT_STATIC;HAVE_SQLITE;HAVE_JANSSON;HAVE_LIBEVENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>
       </SDLCheck>
-      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtGui;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngine;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineWidgets;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebEngineCore;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include/QtWebChannel;..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./_Automated;../../../Source;../../../Source/ThirdParty/sqlite;../../../../libevent/WIN32-Code/nmake;../../../../libevent/include;../../../../jansson/src;../../../../jansson/Contrib/VC17/Jansson;../../../../zlib;../../../../libxslt;../../../../libxml2/include;../../../../MediaInfoLib/Source;../../../../ZenLib/Source</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DebugInformationFormat>None</DebugInformationFormat>
@@ -155,14 +152,13 @@
       <GenerateDebugInformation>No</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64\lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5WebChannel.lib;Qt5WebEngine.lib;Qt5WebEngineWidgets.lib;qtmain.lib;winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>Pre-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 Engine</Command>
+      <Command>Pre-Build.bat Engine</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>Post-Build.bat ..\..\..\..\Qt5.9-msvc2017_64\5.9\msvc2017_64 $(OutDir) $(Configuration)</Command>
+      <Command>Post-Build.bat $(OutDir) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/Project/MSVC2022/GUI/Post-Build.bat b/Project/MSVC2022/GUI/Post-Build.bat
index 7070eae1..51c0c808 100644
--- a/Project/MSVC2022/GUI/Post-Build.bat
+++ b/Project/MSVC2022/GUI/Post-Build.bat
@@ -1,8 +1,3 @@
-if "%2"=="" echo "Post-Build.bat Qt_Dir Output_Dir" | find /v "0 "
+if "%1"=="" echo "Post-Build.bat Output_Dir" | find /v "0 "
 
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\windeployqt
-) else (
-%1\bin\windeployqt --release %2
-)
+windeployqt --release %1
diff --git a/Project/MSVC2022/GUI/Pre-Build.bat b/Project/MSVC2022/GUI/Pre-Build.bat
index 4828e8b6..ef04d113 100644
--- a/Project/MSVC2022/GUI/Pre-Build.bat
+++ b/Project/MSVC2022/GUI/Pre-Build.bat
@@ -1,9 +1,4 @@
-if "%2"=="" echo "Pre-Build.bat Qt_Dir Kit|Engine" | find /v "0 "
+if "%1"=="" echo "Pre-Build.bat Kit|Engine" | find /v "0 "
 
-if not exist %1 (
-echo Missing Qt directory %1. Correct the Qt path in project properties: Include Directories, Library Directories, Pre-Build, Post-Build.
-%1\bin\qmake
-) else (
-%1\bin\qmake ..\..\Qt\MediaConch.pro USE_WEB%2=1 2> nul
-nmake /NOLOGO /f Makefile.Release compiler_uic_make_all compiler_rcc_make_all mocables 
-)
\ No newline at end of file
+qmake ..\..\Qt\MediaConch.pro USE_WEB%1=1 2> nul
+nmake /NOLOGO /f Makefile.Release compiler_uic_make_all compiler_rcc_make_all mocables