diff --git a/contrib/msvc2019/LICENSE b/contrib/msvc2019/LICENSE
deleted file mode 100644
index 412a0068..00000000
--- a/contrib/msvc2019/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Sridhar Boovaraghavan  GitHub Handle: sridharb1
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj b/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj
deleted file mode 100644
index 989f7b68..00000000
--- a/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <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>{0C0707B2-8DCA-3C21-BD30-A4B4EF43B667}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>x64</Platform>
-    <ProjectName>unit_tests</ProjectName>
-    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <UseFullPaths>false</UseFullPaths>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <UseFullPaths>false</UseFullPaths>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <UseFullPaths>false</UseFullPaths>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <UseFullPaths>false</UseFullPaths>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\mainTestRunner.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\unitTests\gtestwrapper.h" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_basicio.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_types.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_tiffheader.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_futils.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_enforce.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_safe_op.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_XmpKey.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_DateValue.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_TimeValue.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_cr2header_int.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_helper_functions.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_slice.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\unitTests\test_image_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\config.h" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\exiv2.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rwlock.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\slice.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\basicio.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\basicio.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\bigtiffimage.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\bmpimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\bmpimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\convert.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\convert.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\cr2image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\cr2image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\crwimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\crwimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\datasets.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\datasets.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\easyaccess.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\easyaccess.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\epsimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\epsimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\error.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\error.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\exif.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\exif.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\futils.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\futils.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\gifimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\gifimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\http.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\http.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\ini.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\ini.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\iptc.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\iptc.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\jp2image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\jp2image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\jpgimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\jpgimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\metadatum.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\metadatum.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\mrwimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\mrwimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\orfimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\orfimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pgfimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\pgfimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\preview.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\preview.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\properties.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\properties.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\psdimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\psdimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\rafimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rafimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\rw2image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rw2image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tags.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tags.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tgaimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tgaimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tiffimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\types.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\types.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\value.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\value.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\version.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\version.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\webpimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\webpimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\xmp.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\xmp_exiv2.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\xmpsidecar.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\xmpsidecar.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\ssh.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\ssh.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pngimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\pngimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\asfvideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\asfvideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\matroskavideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\matroskavideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\quicktimevideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\quicktimevideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\riffvideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\riffvideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\utilsvideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\utilsvideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\canonmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\canonmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\casiomn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\casiomn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\cr2header_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\cr2header_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\crwimage_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\crwimage_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\fujimn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\fujimn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\helper_functions.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\helper_functions.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\image_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\image_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\makernote_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\makernote_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\minoltamn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\minoltamn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\nikonmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\nikonmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\olympusmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\olympusmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\orfimage_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\orfimage_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\panasonicmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\panasonicmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pentaxmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\pentaxmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\rw2image_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\rw2image_int.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\safe_op.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\samsungmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\samsungmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\sigmamn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\sigmamn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\sonymn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\sonymn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tags_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tags_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffcomposite_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tiffcomposite_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffimage_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tiffimage_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffvisitor_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tiffvisitor_int.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tifffwd_int.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\timegm.h" />
-    <ClInclude Include="$(ProjectDir)..\..\src\unused.h" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pngchunk_int.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
-      <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
-      <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\googletest\build\googletest\gtest.vcxproj">
-      <Project>{95e9b845-09d7-3453-aeeb-2e1005096e32}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\googletest\build\googletest\gtest_main.vcxproj">
-      <Project>{db773438-551f-38fa-8d50-d0261199236b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
-      <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
-      <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
-      <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
-      <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
-      <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
-      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
-      <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
-      <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
-      <Name>exiv2-xmp</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/msvc2019/README.md b/contrib/vs2019/README.md
similarity index 57%
rename from contrib/msvc2019/README.md
rename to contrib/vs2019/README.md
index 54252e69..0d482774 100644
--- a/contrib/msvc2019/README.md
+++ b/contrib/vs2019/README.md
@@ -1,27 +1,12 @@
 # exiv2-x86_x64
 Visual Studio project files to compile exiv2 on Windows (x86/x64/Release/Debug)
 
-# Motivation #
-I use Visual Studio on Windows for my personal product development. I
-needed to use exiv2 for a project to sync my photographs in
-[Picasa](https://picasa.google.com/)[^1] to
-[Piwigo](https://github.com/Piwigo/). I use Piwigo, running on my own
-server, because I do not want to share my family photographs in
-platforms like facebook, google photos, instagram, whatsapp etc. For
-the same privacy concerns, this piwigo gallery on my server is not
-public and is accessed through credentials shared only with family.
-
 ## Background ##
-I started this project quite a while ago (mid-2016). I got it to a
-working state by the end of 2019, mostly because it has been hard to
-find solid time to devote to this. Needless to say, there was nothing
-that did exactly what I wanted and few other projects that did some of
-what I needed. I borrowed liberally to cobble up this solution.
-
-One of the main building blocks was exiv2. When I started this
-project, support for building on Windows using Visual Studio was quite
-good and in particular, [Robin Mills](https://github.com/clanmills),
-the then maintainer, was excellent in helping resolve questions.
+One of the main building blocks for a personal product that I was
+developing was exiv2. When I started this project, support for
+building on Windows using Visual Studio was quite good and in
+particular, [Robin Mills](https://github.com/clanmills), the then
+maintainer, was excellent in helping resolve questions.
 
 However, as time progressed, the maintainers changed and their primary
 focus turned to Linux and Windows compilation was an afterthought
@@ -45,10 +30,6 @@ utility of the product is diminished. This project is to help people
 who would like to build exiv2 using Visual Studio on Windows, to do
 so.
 
-**Note** As the code in the master exiv2 repository changes, these
-project files may not work out of the box. However, with small
-changes, they could be made to work with the latest.
-
 ## Building Philosophy ##
 Unlike the linux-style philosophy of installing everything in and then,
 linking from, /usr/local-type folders, typically source trees on
@@ -82,16 +63,153 @@ expat-static project is added as a reference to the exiv2
 project. This make Visual Studio generate the correct dependency
 heirarchy and compile correctly.
 
+# Folder Structure #
+
+Because these are project files that are pre-generated, they expect
+exiv2 and its dependencies to be placed in a certain hierarchy.
+
+Each of the dependencies will have to be placed at the same level as
+the exiv2 source tree.
+
+For e.g.
+
+    C:\Sources\exiv2
+    C:\Sources\zlib
+    C:\Sources\openssl
+    C:\Sources\libssh2
+
+and so on. The requirement that it be at the same level as the exiv2
+source tree is only mandated in a relative sense. That is, you could
+have your exiv2 sources in C:\Sources or E:\Projects or
+C:\Users\Sridhar\Documents\VS\exiv2. There are problems with spaces in
+directory names, because there are some commands executed through
+utilities like perl which may not handle them well. Please don't use
+spaces.
+
+## VS solution/projects for dependencies ##
+
+Just like the solution/project file to compile exiv2 in VS (the one
+that you are reading about now), most dependencies also have similar
+VS solution/project files, because their VS-build infrastructure is
+deficient. Specific instructions on fetching these project files
+separately and copying them to the source tree is given below for each
+dependency. I fetch these *-x86_x64 repositories into a separate
+folder from these other source folders. For e.g., I keep these in
+E:\Projects\github. Whereas the sources are in E:\Projects.
+
+Theoretically, just fetching these dependency sources, placing them in
+the correct folder hierarchies, fetching their associated VS project
+files and placing them in the source tree in specific folders
+(detailed below) should be enough to compile exiv2 directly. exiv2
+links against static libraries of these dependencies. However, these
+dependencies are full-fledged distributions that contain, apart from
+those libraries that exiv2 needs, other executables and tests. These
+can be compiled, optionally, if one needs to test the integrity of
+those projects.
+
+## Dependency Order ##
+
+Some of these dependencies depend on other dependencies. Thus, it is
+best if they are executed in the order shown below.
+
+# Dependencies #
+  * [Strawberry Perl, used v5.30.1.1 x64](strawberryperl.com)
+  * [NASM, used 2.14.02 x64](https://www.nasm.us/)
+  * [Visual Studio, used Community 2019 edition, v16.5.4](https://visualstudio.microsoft.com/)
+  * [zlib, tested w/ v1.2.11](https://github.com/madler/zlib.git)
+    * Optionally, switch the git tree to the 1.2.11 branch.
+    * Use my [zlib-x86_x64](https://github.com/sridharb1/zlib-x86_x64)
+      to compile on Windows using Visual Studio
+    * Copy the contents of this folder into the contrib folder
+      of the zlib repository. Thus, the contrib/vc14 folder of
+      zlib-x86_x64 should overwrite the same in zlib.
+    * Optionally, use zlibvc.sln to compile.
+  * [libexpat, tested w/ v2.2.9](https://github.com/libexpat/libexpat)
+    * Optionally, switch the git tree to the R_2_2_9 branch.
+    * Use my
+      [libexpat-x86_x64](https://github.com/sridharb1/libexpat-x86_x64)
+      to compile on Windows using Visual Studio 
+    * Copy the build folder of libexpat-x86_x64 into the libexpat
+      source tree.
+    * Optionally, use expat.sln to compile.
+  * [OpenSSL, tested w/ v1.1.1g-DEV](https://github.com/openssl/openssl)
+    * Optionally, switch the git tree to the OpenSSL_1_1_1-stable branch.
+    * Use my
+      [openssl-x86_x64](https://github.com/sridharb1/openssl-x86_x64)
+      to compile on Windows using Visual Studio
+    * Copy the build folder of openssl-x86_x64 into the openssl tree.
+    * Optionally, use openssl1_1.sln to compile.
+  * [libssh, tested w/ v0.9.3](https://git.libssh.org/projects/libssh.git/)
+    * Optionally, switch the git tree to the stable-0.9 branch.
+    * Use my
+      [libssh-x86_x64](https://github.com/sridharb1/libssh-x86_x64.git)
+      to compile on Windows using Visual Studio
+    * Copy the build folder of libssh-x86_x64 into the libssh source tree.
+    * Optionally, use libssh.sln to compile.
+  * [libssh2, tested w/ v1.9.0](https://github.com/libssh2/libssh2.git)
+    * Optionally, switch the git tree to the libssh2-1.9.0 branch.
+    * Use my
+      [libssh2-x86_x64](https://github.com/sridharb1/libssh2-x86_x64.git)
+      to compile on Windows using Visual Studio
+    * Copy the build folder of libssh2-x86_x64 into the libssh2 source tree.
+    * Optionally, use libssh2.sln to compile.
+  * [brotli, tested w/ v1.0.7+](https://github.com/google/brotli)
+    * Use my
+      [brotli-x86_x64](https://github.com/sridharb1/brotli-x86_x64.git)
+      to compile on Windows using Visual Studio
+    * Copy the build_folder folder of brotli-x86_x64 into the brotli source tree.
+    * Optionally, use brotli.sln to compile.
+  * [curl, tested w/ v7.69.1](https://github.com/curl/curl.git)
+    * Optionally, switch the git tree to the 7_69_1 branch.
+    * Use my
+      [curl-x86_x64](https://github.com/sridharb1/curl-x86_x64.git)
+      to compile on Windows using Visual Studio
+    * Copy the contents of this folder into the **projects/Windows/VC15**
+      folder of the curl source tree. *Note: instructions different
+      from other projects*
+    * Optionally, use curl_all.sln to compile.
+  * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git)
+    * Optionally, switch the git tree to the v1.10.x branch.
+    * Use my
+      [googletest-x86_x64](https://github.com/sridharb1/googletest-x86_x64.git)
+      to compile on Windows using Visual Studio
+    * Copy the build folder of googletest-x86_x64 into the googletest source tree.
+    * Optionally, use googletest-distribution.sln to compile.
+  * [libintl (aka gettext), tested with v0.20.1](https://git.savannah.gnu.org/git/gettext.git)
+    * When you clone gettext, you might also clone a submodule called
+      gnulib. This is not necessary. You can turn off the recursive
+      flag while cloning.
+    * Optionally, switch the git tree to the 0.20.1 branch.
+    * Use my
+      [gettext-x86_x64](https://github.com/sridharb1/gettext-x86_x64)
+      to compile on Windows using Visual Studio
+    * Copy the build folder into the root folder of gettext source tree.
+    * Optionally, use gettext.sln to compile.
+  * [libiconv, tested w/ v1.16](https://github.com/sridharb1/libiconv-x86_x64)
+    * This dependency is a little different from the others in the
+      sense that in the others, you fetch the source and the VS
+      project files separately. In this case, this repository provides
+      both the source and the VS project files.
+    * Optionally, use libiconv.sln to compile.
+
 # Sources #
   * [Exiv2, tested w/ v0.27.2](https://github.com/Exiv2/exiv2)
-  * Use my [exiv2-x86_x64](https://github.com/sridharb1/exiv2-x86_x64) to
-compile on Windows
-  * Place the contents of exiv2-x86_x64 in a folder called build in the exiv2 repository and build using the provided solution. Please note that the dependencies listed below are needed.
-  * `exiv2 -vV`
+  * In v0.27.3, my solution/project files can be found in contrib/vs2019/solution
+  * For other versions, use my
+    [exiv2-x86_x64](https://github.com/sridharb1/exiv2-x86_x64) to
+    compile on Windows 
+  * It may, in particular, not work for the HEAD or 0.28+ branches as
+    there have been incompatible changes made, that have not been
+    incorporated in these project files.
+  * Place the contents of exiv2-x86_x64 in a folder called
+    contrib/vs2019/solution in the exiv2 repository and build using
+    the provided solution. Please note that the dependencies listed
+    above are needed. 
+  * `exiv2 -vV` (output of generated exiv2.exe on my machine for reference)
 
   ``` shell
   exiv2 0.27.2
-
+  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
   as published by the Free Software Foundation; either version 2
@@ -114,14 +232,14 @@ compile on Windows
   debug=0
   cplusplus=199711
   version=13.25 (2017/x64)
-  date=Mar 21 2020
-  time=16:28:02
-  processpath=E:\Projects\exiv2\build\src\x64\Release
+  date=Apr  6 2020
+  time=11:28:24
+  processpath=E:\My Projects\exiv2\contrib\vs2019\solution\src\x64\Release
   localedir=/../share/locale
   package_name=exiv2
   curlprotocols=dict file ftp ftps gopher http https imap imaps ldap ldaps pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp
   curl=1
-  executable=E:\Projects\exiv2\build\src\x64\Release\exiv2.exe
+  executable=E:\Projects\exiv2\contrib\vs2019\solution\src\x64\Release\exiv2.exe
   library=C:\WINDOWS\SYSTEM32\ntdll.dll
   library=C:\Program Files\AVAST Software\Avast\aswhook.dll
   library=C:\WINDOWS\System32\KERNEL32.DLL
@@ -250,41 +368,3 @@ compile on Windows
   xmlns=xmpTPg:http://ns.adobe.com/xap/1.0/t/pg/
   xmlns=xmpidq:http://ns.adobe.com/xmp/Identifier/qual/1.0/
   ```
-
-# Dependencies #
-  * [zlib, tested w/ v1.2.11](https://github.com/madler/zlib.git)
-  * [Strawberry Perl, used v5.30.1.1 x64](strawberryperl.com)[^2]
-  * [NASM, used 2.14.02 x64](https://www.nasm.us/)[^3]
-  * [libexpat, tested w/ v2.2.9](https://github.com/libexpat/libexpat)[^4]
-  * [OpenSSL, tested w/ v1.1.1e-DEV](https://github.com/openssl/openssl)[^5]
-  * [libssh2, tested w/ v1.9.0](https://github.com/libssh2/libssh2.git)[^6]
-  * [curl, tested w/ v7.69.1](https://github.com/curl/curl.git)[^7]
-  * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git)[^8]
-  * [libintl (aka gettext), tested with v0.20.1](https://git.savannah.gnu.org/git/gettext.git)[^9]
-  * [libiconv, tested w/ v1.16](https://github.com/sridharb1/libiconv-x86_x64)
-  * [libssh, tested w/ v0.9.3](https://git.libssh.org/projects/libssh.git/)[^10]
-  * [Visual Studio, used Community 2019 edition](https://visualstudio.microsoft.com/)
-
-[^1]: It has since been killed by google. (You can find the last released version here: [Picasa 3.9.141, build 259](https://1drv.ms/u/s!AuE8ZYzPkfMfiEzdlKtVVjN-MReT))
-
-[^2]: I installed the binary distribution. perl is only used by the
-openssl makefile to generate the initial configuration. Even this is
-not necessary if the configuration that I chose applies to you.
-
-[^3]: Binary distribution. See [^3].
-
-[^4]: Use my [libexpat-x86_x64](https://github.com/sridharb1/libexpat-x86_x64) to
-compile on Windows using Visual Studio
-
-[^5]: Use my [openssl-x86_x64](https://github.com/sridharb1/openssl-x86_x64) to compile on Windows using Visual Studio
-
-[^6]: Use my [libssh2-x86_x64](https://github.com/sridharb1/libssh2-x86_x64.git) to compile on Windows using Visual Studio
-
-[^7]: Use my [curl-x86_x64](https://github.com/sridharb1/curl-x86_x64.git) to
-compile on Windows using Visual Studio
-
-[^8]: Use my [googletest-x86_x64](https://github.com/sridharb1/googletest-x86_x64.git) to compile on Windows using Visual Studio
-
-[^9]: Use my [gettext-x86_x64](https://github.com/sridharb1/gettext-x86_x64) to compile on Windows using Visual Studio
-
-[^10]: Use my [libssh-x86_x64](https://github.com/sridharb1/libssh-x86_x64.git) to compile on Windows using Visual Studio
diff --git a/contrib/msvc2019/solution/exiv2.sln b/contrib/vs2019/solution/exiv2.sln
similarity index 93%
rename from contrib/msvc2019/solution/exiv2.sln
rename to contrib/vs2019/solution/exiv2.sln
index 9ea1e4d6..96b19b04 100644
--- a/contrib/msvc2019/solution/exiv2.sln
+++ b/contrib/vs2019/solution/exiv2.sln
@@ -246,46 +246,44 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External Dependencies", "Ex
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zlib", "zlib", "{C1530683-7B22-4711-A28D-EB85D6EB4341}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libexpat", "libexpat", "{ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "..\..\libexpat\expat\lib\expat_static.vcxproj", "{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "googletest", "googletest", "{F663E319-59FD-4078-9523-C12E27C3D861}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\googletest\build\googletest\gtest.vcxproj", "{95E9B845-09D7-3453-AEEB-2E1005096E32}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\..\..\googletest\build\googletest\gtest.vcxproj", "{95E9B845-09D7-3453-AEEB-2E1005096E32}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\..\googletest\build\googletest\gtest_main.vcxproj", "{DB773438-551F-38FA-8D50-D0261199236B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\..\..\..\googletest\build\googletest\gtest_main.vcxproj", "{DB773438-551F-38FA-8D50-D0261199236B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "openssl", "openssl", "{CB91FB25-735F-47E6-B03F-07E399A71DF0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_prebuild", "..\..\openssl\build\_prebuild\_prebuild.vcxproj", "{625D49F1-BC00-4C36-AE25-2F408B208B08}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_prebuild", "..\..\..\..\openssl\build\_prebuild\_prebuild.vcxproj", "{625D49F1-BC00-4C36-AE25-2F408B208B08}"
 	ProjectSection(ProjectDependencies) = postProject
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto-1_1", "..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj", "{C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto-1_1", "..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj", "{C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{625D49F1-BC00-4C36-AE25-2F408B208B08} = {625D49F1-BC00-4C36-AE25-2F408B208B08}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssl-1_1", "..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj", "{1E068827-5CD6-4648-98DD-B0417F0B9DDC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssl-1_1", "..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj", "{1E068827-5CD6-4648-98DD-B0417F0B9DDC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{625D49F1-BC00-4C36-AE25-2F408B208B08} = {625D49F1-BC00-4C36-AE25-2F408B208B08}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libiconv", "libiconv", "{2B87527C-BFD7-4052-AACA-56D6FAE909F2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\..\libiconv\libiconv.vcxproj", "{1704EA01-6B21-4362-9F1F-44D25CF2E0D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\..\..\..\libiconv\libiconv.vcxproj", "{1704EA01-6B21-4362-9F1F-44D25CF2E0D7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libssh", "libssh", "{A7FEA0DE-61D3-4581-BA4F-C8AC0696B253}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh", "..\..\libssh\build\src\ssh.vcxproj", "{0AA428D8-E6A8-3A36-9045-621F4DDE3043}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh", "..\..\..\..\libssh\build\src\ssh.vcxproj", "{0AA428D8-E6A8-3A36-9045-621F4DDE3043}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libssh2", "libssh2", "{7B332138-E8B9-4ED5-AB7C-F1F882756BD5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\..\libssh2\build\src\libssh2.vcxproj", "{127DC9DE-814F-312C-8F30-4FE281393B38}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\..\..\..\libssh2\build\src\libssh2.vcxproj", "{127DC9DE-814F-312C-8F30-4FE281393B38}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1E068827-5CD6-4648-98DD-B0417F0B9DDC} = {1E068827-5CD6-4648-98DD-B0417F0B9DDC}
 		{C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C} = {C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C}
@@ -294,7 +292,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\..\libssh2\bu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "curl", "curl", "{968769AE-15C0-4515-8DF2-8AD839A91A7F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1E068827-5CD6-4648-98DD-B0417F0B9DDC} = {1E068827-5CD6-4648-98DD-B0417F0B9DDC}
 		{C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C} = {C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C}
@@ -304,7 +302,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\curl\proje
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libintl", "libintl", "{26B736E5-4188-428A-B802-0F6089EC3F86}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libintl_static", "..\..\gettext\build\gettext\libintl_static.vcxproj", "{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libintl_static", "..\..\..\..\gettext\build\gettext\libintl_static.vcxproj", "{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "..\..\..\..\libexpat\build\lib\expat_static.vcxproj", "{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "brotli", "brotli", "{7D220911-7585-4C99-A8A5-D4D95FA9D817}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlicommon-static", "..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj", "{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlidec-static", "..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj", "{E279DD40-3CAC-3030-875B-28B50015788D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlienc-static", "..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj", "{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -990,22 +998,6 @@ Global
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Template|Win32.Build.0 = Release|Win32
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Template|x64.ActiveCfg = Release|x64
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Template|x64.Build.0 = Release|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.ActiveCfg = Debug|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.Build.0 = Debug|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.ActiveCfg = Debug|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.Build.0 = Debug|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.ActiveCfg = Release|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.Build.0 = Release|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.ActiveCfg = Release|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.Build.0 = Release|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.Build.0 = Release|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.ActiveCfg = Template|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.Build.0 = Template|Win32
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.ActiveCfg = Template|x64
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.Build.0 = Template|x64
 		{95E9B845-09D7-3453-AEEB-2E1005096E32}.Debug|Win32.ActiveCfg = Debug|Win32
 		{95E9B845-09D7-3453-AEEB-2E1005096E32}.Debug|Win32.Build.0 = Debug|Win32
 		{95E9B845-09D7-3453-AEEB-2E1005096E32}.Debug|x64.ActiveCfg = Debug|x64
@@ -1166,6 +1158,70 @@ Global
 		{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}.Template|Win32.Build.0 = Release|Win32
 		{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}.Template|x64.ActiveCfg = Release|x64
 		{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}.Template|x64.Build.0 = Release|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.ActiveCfg = Debug|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.Build.0 = Debug|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.ActiveCfg = Debug|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.Build.0 = Debug|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.ActiveCfg = Release|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.Build.0 = Release|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.ActiveCfg = Release|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.Build.0 = Release|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.Build.0 = Release|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.ActiveCfg = Release|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.Build.0 = Release|Win32
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.ActiveCfg = Release|x64
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.Build.0 = Release|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|Win32.Build.0 = Debug|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|x64.ActiveCfg = Debug|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|x64.Build.0 = Debug|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|Win32.ActiveCfg = Release|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|Win32.Build.0 = Release|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|x64.ActiveCfg = Release|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|x64.Build.0 = Release|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|x64.Build.0 = Release|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|Win32.ActiveCfg = Release|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|Win32.Build.0 = Release|Win32
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|x64.ActiveCfg = Release|x64
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|x64.Build.0 = Release|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Debug|Win32.Build.0 = Debug|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Debug|x64.ActiveCfg = Debug|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Debug|x64.Build.0 = Debug|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Release|Win32.ActiveCfg = Release|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Release|Win32.Build.0 = Release|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Release|x64.ActiveCfg = Release|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Release|x64.Build.0 = Release|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|x64.Build.0 = Release|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Template|Win32.ActiveCfg = Release|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Template|Win32.Build.0 = Release|Win32
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Template|x64.ActiveCfg = Release|x64
+		{E279DD40-3CAC-3030-875B-28B50015788D}.Template|x64.Build.0 = Release|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|Win32.Build.0 = Debug|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|x64.ActiveCfg = Debug|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|x64.Build.0 = Debug|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|Win32.ActiveCfg = Release|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|Win32.Build.0 = Release|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|x64.ActiveCfg = Release|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|x64.Build.0 = Release|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|x64.Build.0 = Release|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|Win32.ActiveCfg = Release|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|Win32.Build.0 = Release|Win32
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|x64.ActiveCfg = Release|x64
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1211,7 +1267,6 @@ Global
 		{C1530683-7B22-4711-A28D-EB85D6EB4341} = {4B90B8DD-9956-4545-BD02-651E72E952DB}
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {C1530683-7B22-4711-A28D-EB85D6EB4341}
 		{ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22} = {4B90B8DD-9956-4545-BD02-651E72E952DB}
-		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615} = {ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22}
 		{F663E319-59FD-4078-9523-C12E27C3D861} = {4B90B8DD-9956-4545-BD02-651E72E952DB}
 		{95E9B845-09D7-3453-AEEB-2E1005096E32} = {F663E319-59FD-4078-9523-C12E27C3D861}
 		{DB773438-551F-38FA-8D50-D0261199236B} = {F663E319-59FD-4078-9523-C12E27C3D861}
@@ -1229,6 +1284,11 @@ Global
 		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {968769AE-15C0-4515-8DF2-8AD839A91A7F}
 		{26B736E5-4188-428A-B802-0F6089EC3F86} = {4B90B8DD-9956-4545-BD02-651E72E952DB}
 		{B8B3B620-FC06-47D0-9D92-BD5CBA448D84} = {26B736E5-4188-428A-B802-0F6089EC3F86}
+		{58A821BC-E4AF-4DF4-9A54-2BAA22B92615} = {ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22}
+		{7D220911-7585-4C99-A8A5-D4D95FA9D817} = {4B90B8DD-9956-4545-BD02-651E72E952DB}
+		{39ABFC9D-42B2-3E32-866B-EC2B980BF85C} = {7D220911-7585-4C99-A8A5-D4D95FA9D817}
+		{E279DD40-3CAC-3030-875B-28B50015788D} = {7D220911-7585-4C99-A8A5-D4D95FA9D817}
+		{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41} = {7D220911-7585-4C99-A8A5-D4D95FA9D817}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A63A651-A83B-3F94-B0B1-6505EABB85A4}
diff --git a/contrib/msvc2019/solution/exiv2lib_export.h b/contrib/vs2019/solution/exiv2lib_export.h
similarity index 100%
rename from contrib/msvc2019/solution/exiv2lib_export.h
rename to contrib/vs2019/solution/exiv2lib_export.h
diff --git a/contrib/msvc2019/solution/exv_conf.h b/contrib/vs2019/solution/exv_conf.h
similarity index 100%
rename from contrib/msvc2019/solution/exv_conf.h
rename to contrib/vs2019/solution/exv_conf.h
diff --git a/contrib/msvc2019/solution/samples/addmoddel.vcxproj b/contrib/vs2019/solution/samples/addmoddel.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/addmoddel.vcxproj
rename to contrib/vs2019/solution/samples/addmoddel.vcxproj
index dff0aa15..cb2ef869 100644
--- a/contrib/msvc2019/solution/samples/addmoddel.vcxproj
+++ b/contrib/vs2019/solution/samples/addmoddel.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\addmoddel.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\addmoddel.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/addmoddel.vcxproj.filters b/contrib/vs2019/solution/samples/addmoddel.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/addmoddel.vcxproj.filters
rename to contrib/vs2019/solution/samples/addmoddel.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/conntest.vcxproj b/contrib/vs2019/solution/samples/conntest.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/conntest.vcxproj
rename to contrib/vs2019/solution/samples/conntest.vcxproj
index 4ea500cd..50ffeae9 100644
--- a/contrib/msvc2019/solution/samples/conntest.vcxproj
+++ b/contrib/vs2019/solution/samples/conntest.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,47 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\conntest.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\conntest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
-      <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/conntest.vcxproj.filters b/contrib/vs2019/solution/samples/conntest.vcxproj.filters
similarity index 71%
rename from contrib/msvc2019/solution/samples/conntest.vcxproj.filters
rename to contrib/vs2019/solution/samples/conntest.vcxproj.filters
index bf345d88..c886facc 100644
--- a/contrib/msvc2019/solution/samples/conntest.vcxproj.filters
+++ b/contrib/vs2019/solution/samples/conntest.vcxproj.filters
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="E:\Projects\exiv2\samples\conntest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\conntest.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
diff --git a/contrib/msvc2019/solution/samples/convert-test.vcxproj b/contrib/vs2019/solution/samples/convert-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/convert-test.vcxproj
rename to contrib/vs2019/solution/samples/convert-test.vcxproj
index dc3dd06f..ccf62a97 100644
--- a/contrib/msvc2019/solution/samples/convert-test.vcxproj
+++ b/contrib/vs2019/solution/samples/convert-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\convert-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\convert-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/convert-test.vcxproj.filters b/contrib/vs2019/solution/samples/convert-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/convert-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/convert-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/easyaccess-test.vcxproj b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/easyaccess-test.vcxproj
rename to contrib/vs2019/solution/samples/easyaccess-test.vcxproj
index 61312024..ee553c9b 100644
--- a/contrib/msvc2019/solution/samples/easyaccess-test.vcxproj
+++ b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\easyaccess-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\easyaccess-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/easyaccess-test.vcxproj.filters b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/easyaccess-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/easyaccess-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/exifcomment.vcxproj b/contrib/vs2019/solution/samples/exifcomment.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/exifcomment.vcxproj
rename to contrib/vs2019/solution/samples/exifcomment.vcxproj
index 1a76deb4..4e69f889 100644
--- a/contrib/msvc2019/solution/samples/exifcomment.vcxproj
+++ b/contrib/vs2019/solution/samples/exifcomment.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\exifcomment.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\exifcomment.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/exifcomment.vcxproj.filters b/contrib/vs2019/solution/samples/exifcomment.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/exifcomment.vcxproj.filters
rename to contrib/vs2019/solution/samples/exifcomment.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/exifdata-test.vcxproj b/contrib/vs2019/solution/samples/exifdata-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/exifdata-test.vcxproj
rename to contrib/vs2019/solution/samples/exifdata-test.vcxproj
index 8d29d241..5f522f9b 100644
--- a/contrib/msvc2019/solution/samples/exifdata-test.vcxproj
+++ b/contrib/vs2019/solution/samples/exifdata-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\exifdata-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\exifdata-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/exifdata-test.vcxproj.filters b/contrib/vs2019/solution/samples/exifdata-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/exifdata-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/exifdata-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/exifdata.vcxproj b/contrib/vs2019/solution/samples/exifdata.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/exifdata.vcxproj
rename to contrib/vs2019/solution/samples/exifdata.vcxproj
index a7c1a906..37d7ea4f 100644
--- a/contrib/msvc2019/solution/samples/exifdata.vcxproj
+++ b/contrib/vs2019/solution/samples/exifdata.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\exifdata.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\exifdata.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/exifdata.vcxproj.filters b/contrib/vs2019/solution/samples/exifdata.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/exifdata.vcxproj.filters
rename to contrib/vs2019/solution/samples/exifdata.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/exifprint.vcxproj b/contrib/vs2019/solution/samples/exifprint.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/exifprint.vcxproj
rename to contrib/vs2019/solution/samples/exifprint.vcxproj
index 4dbbb086..d025f7be 100644
--- a/contrib/msvc2019/solution/samples/exifprint.vcxproj
+++ b/contrib/vs2019/solution/samples/exifprint.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\exifprint.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\exifprint.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/exifprint.vcxproj.filters b/contrib/vs2019/solution/samples/exifprint.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/exifprint.vcxproj.filters
rename to contrib/vs2019/solution/samples/exifprint.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/exifvalue.vcxproj b/contrib/vs2019/solution/samples/exifvalue.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/exifvalue.vcxproj
rename to contrib/vs2019/solution/samples/exifvalue.vcxproj
index 219c52af..9d0963b4 100644
--- a/contrib/msvc2019/solution/samples/exifvalue.vcxproj
+++ b/contrib/vs2019/solution/samples/exifvalue.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\exifvalue.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\exifvalue.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/exifvalue.vcxproj.filters b/contrib/vs2019/solution/samples/exifvalue.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/exifvalue.vcxproj.filters
rename to contrib/vs2019/solution/samples/exifvalue.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/exiv2json.vcxproj b/contrib/vs2019/solution/samples/exiv2json.vcxproj
similarity index 79%
rename from contrib/msvc2019/solution/samples/exiv2json.vcxproj
rename to contrib/vs2019/solution/samples/exiv2json.vcxproj
index 49b67a11..b219e2df 100644
--- a/contrib/msvc2019/solution/samples/exiv2json.vcxproj
+++ b/contrib/vs2019/solution/samples/exiv2json.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,43 +235,52 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\exiv2json.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\samples\Jzon.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\samples\Jzon.h" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\exiv2json.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\Jzon.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\samples\Jzon.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/exiv2json.vcxproj.filters b/contrib/vs2019/solution/samples/exiv2json.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/exiv2json.vcxproj.filters
rename to contrib/vs2019/solution/samples/exiv2json.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/geotag.vcxproj b/contrib/vs2019/solution/samples/geotag.vcxproj
similarity index 74%
rename from contrib/msvc2019/solution/samples/geotag.vcxproj
rename to contrib/vs2019/solution/samples/geotag.vcxproj
index e6c9a74b..50f75752 100644
--- a/contrib/msvc2019/solution/samples/geotag.vcxproj
+++ b/contrib/vs2019/solution/samples/geotag.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\geotag.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\geotag.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/geotag.vcxproj.filters b/contrib/vs2019/solution/samples/geotag.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/geotag.vcxproj.filters
rename to contrib/vs2019/solution/samples/geotag.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/getopt-test.vcxproj b/contrib/vs2019/solution/samples/getopt-test.vcxproj
similarity index 77%
rename from contrib/msvc2019/solution/samples/getopt-test.vcxproj
rename to contrib/vs2019/solution/samples/getopt-test.vcxproj
index c29b3889..d179d2f8 100644
--- a/contrib/msvc2019/solution/samples/getopt-test.vcxproj
+++ b/contrib/vs2019/solution/samples/getopt-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,43 +235,52 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\getopt-test.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\utils.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\getopt.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\getopt-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\utils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\getopt.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/getopt-test.vcxproj.filters b/contrib/vs2019/solution/samples/getopt-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/getopt-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/getopt-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/ini-test.vcxproj b/contrib/vs2019/solution/samples/ini-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/ini-test.vcxproj
rename to contrib/vs2019/solution/samples/ini-test.vcxproj
index d0505932..e30d586d 100644
--- a/contrib/msvc2019/solution/samples/ini-test.vcxproj
+++ b/contrib/vs2019/solution/samples/ini-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\ini-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\ini-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/ini-test.vcxproj.filters b/contrib/vs2019/solution/samples/ini-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/ini-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/ini-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/iotest.vcxproj b/contrib/vs2019/solution/samples/iotest.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/iotest.vcxproj
rename to contrib/vs2019/solution/samples/iotest.vcxproj
index 06784759..8b952544 100644
--- a/contrib/msvc2019/solution/samples/iotest.vcxproj
+++ b/contrib/vs2019/solution/samples/iotest.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\iotest.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\iotest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/iotest.vcxproj.filters b/contrib/vs2019/solution/samples/iotest.vcxproj.filters
similarity index 71%
rename from contrib/msvc2019/solution/samples/iotest.vcxproj.filters
rename to contrib/vs2019/solution/samples/iotest.vcxproj.filters
index 8cac8d0c..25fdaa79 100644
--- a/contrib/msvc2019/solution/samples/iotest.vcxproj.filters
+++ b/contrib/vs2019/solution/samples/iotest.vcxproj.filters
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="E:\Projects\exiv2\samples\iotest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\iotest.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
diff --git a/contrib/msvc2019/solution/samples/iptceasy.vcxproj b/contrib/vs2019/solution/samples/iptceasy.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/iptceasy.vcxproj
rename to contrib/vs2019/solution/samples/iptceasy.vcxproj
index 6d83d733..e64b5deb 100644
--- a/contrib/msvc2019/solution/samples/iptceasy.vcxproj
+++ b/contrib/vs2019/solution/samples/iptceasy.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\iptceasy.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\iptceasy.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/iptceasy.vcxproj.filters b/contrib/vs2019/solution/samples/iptceasy.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/iptceasy.vcxproj.filters
rename to contrib/vs2019/solution/samples/iptceasy.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/iptcprint.vcxproj b/contrib/vs2019/solution/samples/iptcprint.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/iptcprint.vcxproj
rename to contrib/vs2019/solution/samples/iptcprint.vcxproj
index e694c1f9..d98cfc65 100644
--- a/contrib/msvc2019/solution/samples/iptcprint.vcxproj
+++ b/contrib/vs2019/solution/samples/iptcprint.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\iptcprint.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\iptcprint.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/iptcprint.vcxproj.filters b/contrib/vs2019/solution/samples/iptcprint.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/iptcprint.vcxproj.filters
rename to contrib/vs2019/solution/samples/iptcprint.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/iptctest.vcxproj b/contrib/vs2019/solution/samples/iptctest.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/iptctest.vcxproj
rename to contrib/vs2019/solution/samples/iptctest.vcxproj
index ea9351e0..a7b5d5e6 100644
--- a/contrib/msvc2019/solution/samples/iptctest.vcxproj
+++ b/contrib/vs2019/solution/samples/iptctest.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\iptctest.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\iptctest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/iptctest.vcxproj.filters b/contrib/vs2019/solution/samples/iptctest.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/iptctest.vcxproj.filters
rename to contrib/vs2019/solution/samples/iptctest.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/key-test.vcxproj b/contrib/vs2019/solution/samples/key-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/key-test.vcxproj
rename to contrib/vs2019/solution/samples/key-test.vcxproj
index 074d884c..41a7e500 100644
--- a/contrib/msvc2019/solution/samples/key-test.vcxproj
+++ b/contrib/vs2019/solution/samples/key-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\key-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\key-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/key-test.vcxproj.filters b/contrib/vs2019/solution/samples/key-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/key-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/key-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/largeiptc-test.vcxproj b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/largeiptc-test.vcxproj
rename to contrib/vs2019/solution/samples/largeiptc-test.vcxproj
index ac068ac1..2c42c4fe 100644
--- a/contrib/msvc2019/solution/samples/largeiptc-test.vcxproj
+++ b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\largeiptc-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\largeiptc-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/largeiptc-test.vcxproj.filters b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/largeiptc-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/largeiptc-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/metacopy.vcxproj b/contrib/vs2019/solution/samples/metacopy.vcxproj
similarity index 77%
rename from contrib/msvc2019/solution/samples/metacopy.vcxproj
rename to contrib/vs2019/solution/samples/metacopy.vcxproj
index 644667b6..1b8e2b9b 100644
--- a/contrib/msvc2019/solution/samples/metacopy.vcxproj
+++ b/contrib/vs2019/solution/samples/metacopy.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,43 +235,52 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\metacopy.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\utils.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\getopt.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\metacopy.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\utils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\getopt.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/metacopy.vcxproj.filters b/contrib/vs2019/solution/samples/metacopy.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/metacopy.vcxproj.filters
rename to contrib/vs2019/solution/samples/metacopy.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/mmap-test.vcxproj b/contrib/vs2019/solution/samples/mmap-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/mmap-test.vcxproj
rename to contrib/vs2019/solution/samples/mmap-test.vcxproj
index 14020db6..53c714e3 100644
--- a/contrib/msvc2019/solution/samples/mmap-test.vcxproj
+++ b/contrib/vs2019/solution/samples/mmap-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\mmap-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\mmap-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/mmap-test.vcxproj.filters b/contrib/vs2019/solution/samples/mmap-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/mmap-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/mmap-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/mrwthumb.vcxproj b/contrib/vs2019/solution/samples/mrwthumb.vcxproj
similarity index 79%
rename from contrib/msvc2019/solution/samples/mrwthumb.vcxproj
rename to contrib/vs2019/solution/samples/mrwthumb.vcxproj
index 0f2f4461..df4b63f0 100644
--- a/contrib/msvc2019/solution/samples/mrwthumb.vcxproj
+++ b/contrib/vs2019/solution/samples/mrwthumb.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,10 +100,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,10 +139,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,10 +177,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,10 +215,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\mrwthumb.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\mrwthumb.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
@@ -277,4 +286,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/contrib/msvc2019/solution/samples/mrwthumb.vcxproj.filters b/contrib/vs2019/solution/samples/mrwthumb.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/mrwthumb.vcxproj.filters
rename to contrib/vs2019/solution/samples/mrwthumb.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/pathtest.vcxproj b/contrib/vs2019/solution/samples/pathtest.vcxproj
similarity index 77%
rename from contrib/msvc2019/solution/samples/pathtest.vcxproj
rename to contrib/vs2019/solution/samples/pathtest.vcxproj
index 82611c30..d9511efb 100644
--- a/contrib/msvc2019/solution/samples/pathtest.vcxproj
+++ b/contrib/vs2019/solution/samples/pathtest.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,43 +235,52 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\path-test.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\utils.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\getopt.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\path-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\utils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\getopt.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/pathtest.vcxproj.filters b/contrib/vs2019/solution/samples/pathtest.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/pathtest.vcxproj.filters
rename to contrib/vs2019/solution/samples/pathtest.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/prevtest.vcxproj b/contrib/vs2019/solution/samples/prevtest.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/prevtest.vcxproj
rename to contrib/vs2019/solution/samples/prevtest.vcxproj
index 8c6326d6..36c88d15 100644
--- a/contrib/msvc2019/solution/samples/prevtest.vcxproj
+++ b/contrib/vs2019/solution/samples/prevtest.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\prevtest.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\prevtest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/prevtest.vcxproj.filters b/contrib/vs2019/solution/samples/prevtest.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/prevtest.vcxproj.filters
rename to contrib/vs2019/solution/samples/prevtest.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/remotetest.vcxproj b/contrib/vs2019/solution/samples/remotetest.vcxproj
similarity index 79%
rename from contrib/msvc2019/solution/samples/remotetest.vcxproj
rename to contrib/vs2019/solution/samples/remotetest.vcxproj
index c1a4ea4a..28ca4f34 100644
--- a/contrib/msvc2019/solution/samples/remotetest.vcxproj
+++ b/contrib/vs2019/solution/samples/remotetest.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\remotetest.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\remotetest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/remotetest.vcxproj.filters b/contrib/vs2019/solution/samples/remotetest.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/remotetest.vcxproj.filters
rename to contrib/vs2019/solution/samples/remotetest.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/stringto-test.vcxproj b/contrib/vs2019/solution/samples/stringto-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/stringto-test.vcxproj
rename to contrib/vs2019/solution/samples/stringto-test.vcxproj
index 852bbee8..d5b3a2a2 100644
--- a/contrib/msvc2019/solution/samples/stringto-test.vcxproj
+++ b/contrib/vs2019/solution/samples/stringto-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\stringto-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\stringto-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/stringto-test.vcxproj.filters b/contrib/vs2019/solution/samples/stringto-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/stringto-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/stringto-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/taglist.vcxproj b/contrib/vs2019/solution/samples/taglist.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/taglist.vcxproj
rename to contrib/vs2019/solution/samples/taglist.vcxproj
index 30aa5c61..6834c780 100644
--- a/contrib/msvc2019/solution/samples/taglist.vcxproj
+++ b/contrib/vs2019/solution/samples/taglist.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\taglist.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\taglist.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/taglist.vcxproj.filters b/contrib/vs2019/solution/samples/taglist.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/taglist.vcxproj.filters
rename to contrib/vs2019/solution/samples/taglist.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/tiff-test.vcxproj b/contrib/vs2019/solution/samples/tiff-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/tiff-test.vcxproj
rename to contrib/vs2019/solution/samples/tiff-test.vcxproj
index b6d989f9..97638591 100644
--- a/contrib/msvc2019/solution/samples/tiff-test.vcxproj
+++ b/contrib/vs2019/solution/samples/tiff-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\tiff-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\tiff-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/tiff-test.vcxproj.filters b/contrib/vs2019/solution/samples/tiff-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/tiff-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/tiff-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/werror-test.vcxproj b/contrib/vs2019/solution/samples/werror-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/werror-test.vcxproj
rename to contrib/vs2019/solution/samples/werror-test.vcxproj
index 7906f768..ff087e0f 100644
--- a/contrib/msvc2019/solution/samples/werror-test.vcxproj
+++ b/contrib/vs2019/solution/samples/werror-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\werror-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\werror-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/werror-test.vcxproj.filters b/contrib/vs2019/solution/samples/werror-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/werror-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/werror-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/write-test.vcxproj b/contrib/vs2019/solution/samples/write-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/write-test.vcxproj
rename to contrib/vs2019/solution/samples/write-test.vcxproj
index d9bf4d97..14bd2b00 100644
--- a/contrib/msvc2019/solution/samples/write-test.vcxproj
+++ b/contrib/vs2019/solution/samples/write-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\write-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\write-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/write-test.vcxproj.filters b/contrib/vs2019/solution/samples/write-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/write-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/write-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/write2-test.vcxproj b/contrib/vs2019/solution/samples/write2-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/write2-test.vcxproj
rename to contrib/vs2019/solution/samples/write2-test.vcxproj
index 5839e168..97bb3bc7 100644
--- a/contrib/msvc2019/solution/samples/write2-test.vcxproj
+++ b/contrib/vs2019/solution/samples/write2-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\write2-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\write2-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/write2-test.vcxproj.filters b/contrib/vs2019/solution/samples/write2-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/write2-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/write2-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/xmpdump.vcxproj b/contrib/vs2019/solution/samples/xmpdump.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/xmpdump.vcxproj
rename to contrib/vs2019/solution/samples/xmpdump.vcxproj
index 94aff738..6ffeb7f2 100644
--- a/contrib/msvc2019/solution/samples/xmpdump.vcxproj
+++ b/contrib/vs2019/solution/samples/xmpdump.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\xmpdump.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\xmpdump.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/xmpdump.vcxproj.filters b/contrib/vs2019/solution/samples/xmpdump.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/xmpdump.vcxproj.filters
rename to contrib/vs2019/solution/samples/xmpdump.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/xmpparse.vcxproj b/contrib/vs2019/solution/samples/xmpparse.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/xmpparse.vcxproj
rename to contrib/vs2019/solution/samples/xmpparse.vcxproj
index 309227dd..7343bee8 100644
--- a/contrib/msvc2019/solution/samples/xmpparse.vcxproj
+++ b/contrib/vs2019/solution/samples/xmpparse.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\xmpparse.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\xmpparse.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/xmpparse.vcxproj.filters b/contrib/vs2019/solution/samples/xmpparse.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/xmpparse.vcxproj.filters
rename to contrib/vs2019/solution/samples/xmpparse.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/xmpparser-test.vcxproj b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/xmpparser-test.vcxproj
rename to contrib/vs2019/solution/samples/xmpparser-test.vcxproj
index 62b7e32c..1c372ab6 100644
--- a/contrib/msvc2019/solution/samples/xmpparser-test.vcxproj
+++ b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\xmpparser-test.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\xmpparser-test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/xmpparser-test.vcxproj.filters b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/xmpparser-test.vcxproj.filters
rename to contrib/vs2019/solution/samples/xmpparser-test.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/xmpprint.vcxproj b/contrib/vs2019/solution/samples/xmpprint.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/xmpprint.vcxproj
rename to contrib/vs2019/solution/samples/xmpprint.vcxproj
index 2c82503f..bc4217e6 100644
--- a/contrib/msvc2019/solution/samples/xmpprint.vcxproj
+++ b/contrib/vs2019/solution/samples/xmpprint.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\xmpprint.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\xmpprint.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/xmpprint.vcxproj.filters b/contrib/vs2019/solution/samples/xmpprint.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/xmpprint.vcxproj.filters
rename to contrib/vs2019/solution/samples/xmpprint.vcxproj.filters
diff --git a/contrib/msvc2019/solution/samples/xmpsample.vcxproj b/contrib/vs2019/solution/samples/xmpsample.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/xmpsample.vcxproj
rename to contrib/vs2019/solution/samples/xmpsample.vcxproj
index 8e551e3a..d1084dec 100644
--- a/contrib/msvc2019/solution/samples/xmpsample.vcxproj
+++ b/contrib/vs2019/solution/samples/xmpsample.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -100,11 +100,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -121,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -139,11 +139,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -177,11 +177,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -198,7 +198,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -215,11 +215,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -235,41 +235,50 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\samples\xmpsample.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\samples\xmpsample.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
     <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
       <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/samples/xmpsample.vcxproj.filters b/contrib/vs2019/solution/samples/xmpsample.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/samples/xmpsample.vcxproj.filters
rename to contrib/vs2019/solution/samples/xmpsample.vcxproj.filters
diff --git a/contrib/msvc2019/solution/src/exiv2.vcxproj b/contrib/vs2019/solution/src/exiv2.vcxproj
similarity index 74%
rename from contrib/msvc2019/solution/src/exiv2.vcxproj
rename to contrib/vs2019/solution/src/exiv2.vcxproj
index b485ed46..74fd14f8 100644
--- a/contrib/msvc2019/solution/src/exiv2.vcxproj
+++ b/contrib/vs2019/solution/src/exiv2.vcxproj
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -99,11 +99,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -120,7 +120,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -137,11 +137,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -158,7 +158,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -174,11 +174,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -195,7 +195,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -211,11 +211,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -231,48 +231,57 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\src\exiv2.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\exiv2app.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\actions.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\actions.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\getopt.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\getopt.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\utils.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\utils.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\exiv2.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\exiv2app.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\actions.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\actions.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\getopt.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\getopt.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\utils.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\utils.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
       <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
       <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
       <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libiconv\libiconv.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libiconv\libiconv.vcxproj">
       <Project>{1704ea01-6b21-4362-9f1f-44d25cf2e0d7}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
       <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
       <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
       <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
       <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
       <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
       <Name>exiv2-xmp</Name>
     </ProjectReference>
-    <ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
+    <ProjectReference Include="..\src\exiv2lib.vcxproj">
       <Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
       <Name>exiv2lib</Name>
     </ProjectReference>
diff --git a/contrib/msvc2019/solution/src/exiv2.vcxproj.filters b/contrib/vs2019/solution/src/exiv2.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/src/exiv2.vcxproj.filters
rename to contrib/vs2019/solution/src/exiv2.vcxproj.filters
diff --git a/contrib/msvc2019/solution/src/exiv2lib.vcxproj b/contrib/vs2019/solution/src/exiv2lib.vcxproj
similarity index 50%
rename from contrib/msvc2019/solution/src/exiv2lib.vcxproj
rename to contrib/vs2019/solution/src/exiv2lib.vcxproj
index 75829b0c..f0bea51a 100644
--- a/contrib/msvc2019/solution/src/exiv2lib.vcxproj
+++ b/contrib/vs2019/solution/src/exiv2lib.vcxproj
@@ -78,7 +78,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -95,11 +95,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -109,7 +109,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -126,11 +126,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -140,7 +140,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -156,11 +156,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -170,7 +170,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -186,11 +186,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -199,97 +199,97 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\config.h" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\exiv2.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rwlock.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\slice.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\basicio.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\basicio.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\bigtiffimage.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\bmpimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\bmpimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\convert.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\convert.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\cr2image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\cr2image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\crwimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\crwimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\datasets.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\datasets.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\easyaccess.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\easyaccess.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\epsimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\epsimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\error.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\error.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\exif.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\exif.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\futils.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\futils.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\gifimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\gifimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\http.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\http.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\ini.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\ini.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\iptc.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\iptc.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\jp2image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\jp2image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\jpgimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\jpgimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\metadatum.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\metadatum.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\mrwimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\mrwimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\orfimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\orfimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pgfimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\pgfimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\preview.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\preview.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\properties.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\properties.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\psdimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\psdimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\rafimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rafimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\rw2image.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rw2image.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tags.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tags.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tgaimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tgaimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tiffimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\types.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\types.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\value.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\value.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\version.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\version.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\webpimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\webpimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\xmp.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\xmp_exiv2.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\xmpsidecar.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\xmpsidecar.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\ssh.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\ssh.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pngimage.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\pngimage.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\asfvideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\asfvideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\matroskavideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\matroskavideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\quicktimevideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\quicktimevideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\riffvideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\riffvideo.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\utilsvideo.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\utilsvideo.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\config.h" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\exiv2.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\rwlock.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\slice.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\basicio.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\basicio.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\bigtiffimage.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\bmpimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\bmpimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\convert.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\convert.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\cr2image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\cr2image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\crwimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\crwimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\datasets.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\datasets.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\easyaccess.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\easyaccess.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\epsimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\epsimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\error.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\error.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\exif.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\exif.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\futils.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\futils.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\gifimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\gifimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\http.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\http.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\ini.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\ini.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\iptc.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\iptc.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\jp2image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\jp2image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\jpgimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\jpgimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\metadatum.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\metadatum.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\mrwimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\mrwimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\orfimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\orfimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pgfimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\pgfimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\preview.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\preview.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\properties.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\properties.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\psdimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\psdimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\rafimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\rafimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\rw2image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\rw2image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tags.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\tags.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tgaimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\tgaimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\tiffimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\types.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\types.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\value.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\value.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\version.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\version.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\webpimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\webpimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\xmp.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\xmp_exiv2.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\xmpsidecar.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\xmpsidecar.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\ssh.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\ssh.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pngimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\pngimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\asfvideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\asfvideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\matroskavideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\matroskavideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\quicktimevideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\quicktimevideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\riffvideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\riffvideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\utilsvideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\utilsvideo.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/contrib/msvc2019/solution/src/exiv2lib.vcxproj.filters b/contrib/vs2019/solution/src/exiv2lib.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/src/exiv2lib.vcxproj.filters
rename to contrib/vs2019/solution/src/exiv2lib.vcxproj.filters
diff --git a/contrib/msvc2019/solution/src/exiv2lib_int.vcxproj b/contrib/vs2019/solution/src/exiv2lib_int.vcxproj
similarity index 66%
rename from contrib/msvc2019/solution/src/exiv2lib_int.vcxproj
rename to contrib/vs2019/solution/src/exiv2lib_int.vcxproj
index c726651b..3cafa214 100644
--- a/contrib/msvc2019/solution/src/exiv2lib_int.vcxproj
+++ b/contrib/vs2019/solution/src/exiv2lib_int.vcxproj
@@ -78,7 +78,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -95,11 +95,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -109,7 +109,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -126,11 +126,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -140,7 +140,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -156,11 +156,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -170,7 +170,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -186,11 +186,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -199,55 +199,55 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\src\canonmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\canonmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\casiomn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\casiomn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\cr2header_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\cr2header_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\crwimage_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\crwimage_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\fujimn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\fujimn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\helper_functions.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\helper_functions.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\image_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\image_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\makernote_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\makernote_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\minoltamn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\minoltamn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\nikonmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\nikonmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\olympusmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\olympusmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\orfimage_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\orfimage_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\panasonicmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\panasonicmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pentaxmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\pentaxmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\rw2image_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\rw2image_int.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\safe_op.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\samsungmn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\samsungmn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\sigmamn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\sigmamn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\sonymn_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\sonymn_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tags_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tags_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffcomposite_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tiffcomposite_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffimage_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tiffimage_int.hpp" />
-    <ClCompile Include="$(ProjectDir)..\..\src\tiffvisitor_int.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tiffvisitor_int.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\tifffwd_int.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\src\timegm.h" />
-    <ClInclude Include="$(ProjectDir)..\..\src\unused.h" />
-    <ClCompile Include="$(ProjectDir)..\..\src\pngchunk_int.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\canonmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\canonmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\casiomn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\casiomn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\cr2header_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\cr2header_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\crwimage_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\crwimage_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\fujimn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\fujimn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\helper_functions.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\helper_functions.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\image_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\image_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\makernote_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\makernote_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\minoltamn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\minoltamn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\nikonmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\nikonmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\olympusmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\olympusmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\orfimage_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\orfimage_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\panasonicmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\panasonicmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pentaxmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\pentaxmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\rw2image_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\rw2image_int.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\safe_op.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\samsungmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\samsungmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\sigmamn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\sigmamn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\sonymn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\sonymn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tags_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tags_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffcomposite_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tiffcomposite_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffimage_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tiffimage_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffvisitor_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tiffvisitor_int.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tifffwd_int.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\timegm.h" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\unused.h" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pngchunk_int.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/contrib/msvc2019/solution/src/exiv2lib_int.vcxproj.filters b/contrib/vs2019/solution/src/exiv2lib_int.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/src/exiv2lib_int.vcxproj.filters
rename to contrib/vs2019/solution/src/exiv2lib_int.vcxproj.filters
diff --git a/contrib/vs2019/solution/unitTests/unit_tests.vcxproj b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj
new file mode 100644
index 00000000..892e8112
--- /dev/null
+++ b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <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>{0C0707B2-8DCA-3C21-BD30-A4B4EF43B667}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <Keyword>Win32Proj</Keyword>
+    <Platform>x64</Platform>
+    <ProjectName>unit_tests</ProjectName>
+    <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <Link>
+      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <Link>
+      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <Link>
+      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <UseFullPaths>false</UseFullPaths>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <Link>
+      <AdditionalDependencies>Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\mainTestRunner.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\unitTests\gtestwrapper.h" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_basicio.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_types.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_tiffheader.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_futils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_enforce.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_safe_op.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_XmpKey.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_DateValue.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_TimeValue.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_cr2header_int.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_helper_functions.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_slice.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\unitTests\test_image_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\config.h" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\exiv2.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\rwlock.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\slice.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\basicio.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\basicio.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\bigtiffimage.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\bmpimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\bmpimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\convert.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\convert.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\cr2image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\cr2image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\crwimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\crwimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\datasets.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\datasets.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\easyaccess.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\easyaccess.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\epsimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\epsimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\error.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\error.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\exif.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\exif.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\futils.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\futils.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\gifimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\gifimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\http.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\http.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\ini.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\ini.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\iptc.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\iptc.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\jp2image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\jp2image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\jpgimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\jpgimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\metadatum.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\metadatum.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\mrwimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\mrwimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\orfimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\orfimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pgfimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\pgfimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\preview.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\preview.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\properties.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\properties.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\psdimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\psdimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\rafimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\rafimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\rw2image.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\rw2image.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tags.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\tags.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tgaimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\tgaimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\tiffimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\types.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\types.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\value.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\value.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\version.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\version.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\webpimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\webpimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\xmp.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\xmp_exiv2.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\xmpsidecar.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\xmpsidecar.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\ssh.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\ssh.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pngimage.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\pngimage.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\asfvideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\asfvideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\matroskavideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\matroskavideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\quicktimevideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\quicktimevideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\riffvideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\riffvideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\utilsvideo.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\exiv2\include\exiv2\utilsvideo.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\canonmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\canonmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\casiomn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\casiomn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\cr2header_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\cr2header_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\crwimage_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\crwimage_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\fujimn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\fujimn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\helper_functions.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\helper_functions.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\image_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\image_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\makernote_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\makernote_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\minoltamn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\minoltamn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\nikonmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\nikonmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\olympusmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\olympusmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\orfimage_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\orfimage_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\panasonicmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\panasonicmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pentaxmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\pentaxmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\rw2image_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\rw2image_int.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\safe_op.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\samsungmn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\samsungmn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\sigmamn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\sigmamn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\sonymn_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\sonymn_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tags_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tags_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffcomposite_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tiffcomposite_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffimage_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tiffimage_int.hpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\tiffvisitor_int.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tiffvisitor_int.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\tifffwd_int.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\timegm.h" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\src\unused.h" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\src\pngchunk_int.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj">
+      <Project>{39abfc9d-42b2-3e32-866b-ec2b980bf85c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj">
+      <Project>{e279dd40-3cac-3030-875b-28b50015788d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj">
+      <Project>{2fffa03d-a47c-3aeb-a9e9-611fe2dbba41}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
+      <Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\gettext\build\gettext\libintl_static.vcxproj">
+      <Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\googletest\build\googletest\gtest.vcxproj">
+      <Project>{95e9b845-09d7-3453-aeeb-2e1005096e32}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\googletest\build\googletest\gtest_main.vcxproj">
+      <Project>{db773438-551f-38fa-8d50-d0261199236b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\libexpat\build\lib\expat_static.vcxproj">
+      <Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\libssh2\build\src\libssh2.vcxproj">
+      <Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\libssh\build\src\ssh.vcxproj">
+      <Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
+      <Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
+      <Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
+      <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\src\exiv2lib_int.vcxproj">
+      <Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\xmpsdk\exiv2-xmp.vcxproj">
+      <Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
+      <Name>exiv2-xmp</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj.filters b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/unitTests/unit_tests.vcxproj.filters
rename to contrib/vs2019/solution/unitTests/unit_tests.vcxproj.filters
diff --git a/contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj b/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj
similarity index 73%
rename from contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj
rename to contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj
index ce31564f..4765b9b3 100644
--- a/contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj
+++ b/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj
@@ -78,7 +78,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -95,11 +95,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -109,7 +109,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -126,11 +126,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -140,7 +140,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -156,11 +156,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -170,7 +170,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -186,11 +186,11 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
       <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
@@ -199,31 +199,31 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\ExpatAdapter.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\MD5.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\ParseRDF.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\UnicodeConversions.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\WXMPIterator.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\WXMPMeta.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\WXMPUtils.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XML_Node.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPCore_Impl.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPIterator.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPMeta-GetSet.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPMeta-Parse.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPMeta-Serialize.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPMeta.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPUtils-FileInfo.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\xmpsdk\src\XMPUtils.cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\MD5.h" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\TXMPIterator.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\TXMPMeta.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\TXMPUtils.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\XMP_Const.h" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\XMP_Environment.h" />
-    <None Include="$(ProjectDir)..\..\xmpsdk\include\XMP.incl_cpp" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\XMPSDK.hpp" />
-    <ClInclude Include="$(ProjectDir)..\..\xmpsdk\include\XMP_Version.h" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\ExpatAdapter.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\MD5.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\ParseRDF.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\UnicodeConversions.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\WXMPIterator.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\WXMPMeta.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\WXMPUtils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XML_Node.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPCore_Impl.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPIterator.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPMeta-GetSet.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPMeta-Parse.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPMeta-Serialize.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPMeta.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPUtils-FileInfo.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\..\..\xmpsdk\src\XMPUtils.cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\MD5.h" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\TXMPIterator.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\TXMPMeta.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\TXMPUtils.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\XMP_Const.h" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\XMP_Environment.h" />
+    <None Include="$(ProjectDir)..\..\..\..\xmpsdk\include\XMP.incl_cpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\XMPSDK.hpp" />
+    <ClInclude Include="$(ProjectDir)..\..\..\..\xmpsdk\include\XMP_Version.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters b/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters
similarity index 100%
rename from contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters
rename to contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters