You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2021/10/26 08:08:05 UTC

[ignite] branch master updated: IGNITE-15637 CPP: Remove obsolete Visual Studio projects and solutions - Fixes #9517.

This is an automated email from the ASF dual-hosted git repository.

ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 38a4804  IGNITE-15637 CPP: Remove obsolete Visual Studio projects and solutions - Fixes #9517.
38a4804 is described below

commit 38a4804c4c97e2d366b684e5327ff75a914573cd
Author: Ivan Daschinsky <iv...@apache.org>
AuthorDate: Tue Oct 26 11:05:02 2021 +0300

    IGNITE-15637 CPP: Remove obsolete Visual Studio projects and solutions - Fixes #9517.
    
    Signed-off-by: Ivan Daschinsky <iv...@apache.org>
---
 .gitignore                                         |   1 +
 assembly/release-apache-ignite-base.xml            |  23 +-
 modules/platforms/cpp/CMakeSettings.json.in        |  64 ++++
 modules/platforms/cpp/DEVNOTES.txt                 | 148 ++++-----
 modules/platforms/cpp/binary/CMakeLists.txt        |   6 +-
 .../platforms/cpp/binary/project/vs/binary.vcxproj | 241 --------------
 .../cpp/binary/project/vs/binary.vcxproj.filters   | 175 ----------
 modules/platforms/cpp/common/CMakeLists.txt        |   6 +-
 modules/platforms/cpp/common/project/README.TXT    |   1 -
 modules/platforms/cpp/common/project/vs/README.TXT |   1 -
 .../platforms/cpp/common/project/vs/common.vcxproj | 213 ------------
 .../cpp/common/project/vs/common.vcxproj.filters   | 133 --------
 modules/platforms/cpp/core-test/project/README.TXT |   1 -
 .../platforms/cpp/core-test/project/vs/README.TXT  |   1 -
 .../cpp/core-test/project/vs/core-test.vcxproj     | 244 --------------
 .../core-test/project/vs/core-test.vcxproj.filters | 260 ---------------
 modules/platforms/cpp/core/CMakeLists.txt          |   6 +-
 modules/platforms/cpp/core/project/README.TXT      |   1 -
 modules/platforms/cpp/core/project/vs/README.TXT   |   1 -
 modules/platforms/cpp/core/project/vs/core.vcxproj | 305 -----------------
 .../cpp/core/project/vs/core.vcxproj.filters       | 348 -------------------
 .../platforms/cpp/examples/CMakeSettings.json.in   |  38 +++
 modules/platforms/cpp/examples/README.txt          |  37 ++-
 .../project/vs/cluster-compute-example.vcxproj     | 104 ------
 .../vs/cluster-compute-example.vcxproj.filters     |  33 --
 .../project/vs/compute-example.vcxproj             | 102 ------
 .../project/vs/compute-example.vcxproj.filters     |  27 --
 .../project/vs/continuous-query-example.vcxproj    | 106 ------
 .../vs/continuous-query-example.vcxproj.filters    |  35 --
 .../odbc-example/project/vs/odbc-example.vcxproj   | 111 -------
 .../project/vs/odbc-example.vcxproj.filters        |  36 --
 .../cpp/examples/project/vs/ignite-examples.sln    |  56 ----
 .../project/vs/put-get-example.vcxproj             | 110 ------
 .../project/vs/put-get-example.vcxproj.filters     |  38 ---
 .../query-example/project/vs/query-example.vcxproj | 111 -------
 .../project/vs/query-example.vcxproj.filters       |  35 --
 .../project/vs/thin-client-put-get-example.vcxproj | 104 ------
 .../vs/thin-client-put-get-example.vcxproj.filters |  27 --
 modules/platforms/cpp/ignite/project/README.TXT    |   1 -
 modules/platforms/cpp/ignite/project/vs/README.TXT |   1 -
 .../platforms/cpp/ignite/project/vs/ignite.vcxproj | 170 ----------
 .../cpp/ignite/project/vs/ignite.vcxproj.filters   |  17 -
 modules/platforms/cpp/jni/CMakeLists.txt           |   6 +-
 modules/platforms/cpp/jni/project/README.TXT       |   1 -
 modules/platforms/cpp/jni/project/vs/README.TXT    |   1 -
 modules/platforms/cpp/jni/project/vs/jni.vcxproj   | 204 ------------
 .../cpp/jni/project/vs/jni.vcxproj.filters         |  39 ---
 modules/platforms/cpp/jni/project/vs/module.def    |  25 --
 modules/platforms/cpp/network/CMakeLists.txt       |   6 +-
 .../cpp/network/project/vs/network.vcxproj         | 206 ------------
 .../cpp/network/project/vs/network.vcxproj.filters |  63 ----
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj     | 256 --------------
 .../odbc-test/project/vs/odbc-test.vcxproj.filters | 252 --------------
 modules/platforms/cpp/odbc/CMakeLists.txt          |   8 +-
 .../cpp/odbc/install/ignite-odbc-amd64.wxs         | 114 -------
 .../platforms/cpp/odbc/install/ignite-odbc-x86.wxs | 114 -------
 .../platforms/cpp/odbc/{project/vs => }/module.def |   0
 modules/platforms/cpp/odbc/project/README.TXT      |   1 -
 modules/platforms/cpp/odbc/project/vs/README.TXT   |   1 -
 modules/platforms/cpp/odbc/project/vs/odbc.vcxproj | 287 ----------------
 .../cpp/odbc/project/vs/odbc.vcxproj.filters       | 369 ---------------------
 modules/platforms/cpp/project/vs/ignite.sln        | 138 --------
 modules/platforms/cpp/project/vs/ignite.slnrel     |  98 ------
 modules/platforms/cpp/project/vs/ignite_x86.slnrel |  98 ------
 .../project/vs/thin-client-test.vcxproj            | 206 ------------
 .../project/vs/thin-client-test.vcxproj.filters    | 130 --------
 modules/platforms/cpp/thin-client/CMakeLists.txt   |   6 +-
 .../cpp/thin-client/project/vs/thin-client.vcxproj | 236 -------------
 .../project/vs/thin-client.vcxproj.filters         | 214 ------------
 parent/pom.xml                                     |  11 +-
 70 files changed, 234 insertions(+), 6334 deletions(-)

diff --git a/.gitignore b/.gitignore
index dca4d45..f800453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,7 @@ ipch/
 [Rr]elease*/
 packages
 *.nupkg
+CMakeSettings.json
 
 #CMake temp files
 /modules/platforms/cpp/**/cmake-build**
diff --git a/assembly/release-apache-ignite-base.xml b/assembly/release-apache-ignite-base.xml
index ea16113..5632825 100644
--- a/assembly/release-apache-ignite-base.xml
+++ b/assembly/release-apache-ignite-base.xml
@@ -22,25 +22,6 @@
            xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
            http://maven.apache.org/xsd/component-1.1.2.xsd">
     <files>
-        <!-- Copy CPP files. -->
-        <file>
-            <source>modules/platforms/cpp/project/vs/ignite.slnrel</source>
-            <outputDirectory>/platforms/cpp/project/vs</outputDirectory>
-            <destName>ignite.sln</destName>
-        </file>
-
-        <file>
-            <source>modules/platforms/cpp/project/vs/ignite_x86.slnrel</source>
-            <outputDirectory>/platforms/cpp/project/vs</outputDirectory>
-            <destName>ignite_x86.sln</destName>
-        </file>
-
-        <file>
-            <source>modules/platforms/cpp/CMakeLists.txt</source>
-            <outputDirectory>/platforms/cpp</outputDirectory>
-            <destName>CMakeLists.txt</destName>
-        </file>
-
         <!-- Other files. -->
         <file>
             <source>assembly/LICENSE_IGNITE</source>
@@ -101,13 +82,15 @@
             <outputDirectory>/platforms/dotnet/licenses</outputDirectory>
         </fileSet>
 
-        <!-- Move CPP readme. -->
+        <!-- Move CPP files. -->
         <fileSet>
             <directory>modules/platforms/cpp</directory>
             <outputDirectory>/platforms/cpp</outputDirectory>
             <includes>
                 <include>README.txt</include>
                 <include>DEVNOTES.txt</include>
+                <include>CMakeLists.txt</include>
+                <include>CMakeSettings.json.in</include>
             </includes>
         </fileSet>
 
diff --git a/modules/platforms/cpp/CMakeSettings.json.in b/modules/platforms/cpp/CMakeSettings.json.in
new file mode 100644
index 0000000..40915b7
--- /dev/null
+++ b/modules/platforms/cpp/CMakeSettings.json.in
@@ -0,0 +1,64 @@
+{
+  "environments": [
+    {
+      "JAVA_HOME": "<PATH_TO_JDK>",
+      "BOOST_ROOT": "<PATH_TO_BOOST",
+      "OPENSSL_ROOT_DIR": "<PATH_TO_OPENSSL>",
+      "BuildDir": "${env.USERPROFILE}\\CMakeBuilds\\ignite-cpp\\${workspaceHash}",
+      "InstallDir": "<INSTALL_DIR>"
+    }
+  ],
+
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Visual Studio 15 2017 Win64",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64" ],
+      "buildRoot": "${env.BuildDir}}\\cmake-build-debug",
+      "variables": [
+        {
+          "name": "CMAKE_INSTALL_PREFIX",
+          "value": "${env.InstallDir}\\debug"
+        },
+        {
+          "name": "WITH_ODBC",
+          "value": "ON"
+        },
+        {
+          "name": "WITH_THIN_CLIENT",
+          "value": "ON"
+        },
+        {
+          "name": "WITH_TESTS",
+          "value": "OFF"
+        }
+      ]
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Visual Studio 15 2017 Win64",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x64" ],
+      "buildRoot": "${env.BuildDir}\\cmake-build-release",
+      "variables": [
+        {
+          "name": "CMAKE_INSTALL_PREFIX",
+          "value": "${env.InstallDir}\\release"
+        },
+        {
+          "name": "WITH_ODBC",
+          "value": "ON"
+        },
+        {
+          "name": "WITH_THIN_CLIENT",
+          "value": "ON"
+        },
+        {
+          "name": "WITH_TESTS",
+          "value": "OFF"
+        }
+      ]
+    }
+  ]
+}
diff --git a/modules/platforms/cpp/DEVNOTES.txt b/modules/platforms/cpp/DEVNOTES.txt
index e46a2a5..2cdf4b3 100644
--- a/modules/platforms/cpp/DEVNOTES.txt
+++ b/modules/platforms/cpp/DEVNOTES.txt
@@ -1,47 +1,70 @@
 Apache Ignite C++ Build Instructions
 ====================================
-Here you can find instruction on how to build Apache Ignite C++ core library and
-stand-alone node binary. To build examples you need to build and install core Apache
-Ignite library then refer to $IGNITE_HOME/platforms/cpp/example/README.txt for
+Here you can find instruction on how to build Apache Ignite C++.
+In order to build examples you need to build and install Apache Ignite C++
+libraries then refer to $IGNITE_HOME/platforms/cpp/example/README.txt for
 further instructions.
 
 For details on ODBC driver installation and usage please refer to
 $IGNITE_HOME/platforms/cpp/odbc/README.txt.
 
-Building on Linux and Mac OS X with CMake (Windows currently not yet supported)
-----------------------------------
-
 Common Requirements:
-
- * GCC, g++, CMake >= 3.6 must be installed
+ * C++ compiler and SDK:
+  Linux and Mac OS X:
+   * clang >= 3.9 or gcc >= 3.6
+  Windows:
+   * Visual Studio 2010 or later
+   * Windows SDK 7.1 or later
+ * CMake >= 3.6 must be installed
+
+Core module requirements:
  * Java Development Kit (JDK) must be installed: https://java.com/en/download/index.jsp
  * JAVA_HOME environment variable must be set pointing to Java installation directory.
  * IGNITE_HOME environment variable must be set to Ignite installation directory.
 
-By default building tests, ODBC and thin-client are disabled.
- * OpenSSL, 1.0 or later required for building ODBC and thin-client.
- * UnixODBX required for building ODBC.
- * For building tests, boost framework is required. The following boost libraries are used:
-   * boost_unit_test_framework
-   * boost_thread
-   * boost_system
-   * boost_chrono
-   * boost-regex
+Building core module is enabled by default, you can disable building core module by setting CMake
+option -DWITH_CORE=OFF
+
+Thin-client module requirements:
+ * OpenSSL, 1.0 or later
+
+Thin-client module is disabled by default, you can enable it by setting CMake option -DWITH_THIN_CLIENT=ON
 
-On Mac OS X all dependencies can be installed using Homebrew.
+ODBC module requirements:
+ * OpenSSL, 1.0 or later
+ * UnixODBC on Linux or Mac OS X
+
+ODBC module is disabled by default, you can enable it by setting CMake option -DWITH_ODBC=ON.
+OPENSSL_ROOT_DIR environment variable must be set to openssl installation directory on Windows, on other platforms
+it is required if you want to use non-system openssl.
 
 Building and installing the Apache Ignite C++ components:
  * Navigate to the directory $IGNITE_HOME/platforms/cpp
  * Execute the following commands one by one to build the project:
  * mkdir cmake-build-[release|debug]
  * cd ./cmake-build-[release|debug]
- * cmake -DCMAKE_BUILD_TYPE=[Release|Debug] [-DCMAKE_INSTALL_PREFIX=<install_dir>] ..
- * make
- * make install
-
- * For building ODBC add to cmake option -DWITH_ODBC=ON
- * For building thin client add to cmake option -DWITH_THIN_CLIENT=ON
- * For building with tests add to cmake option -DWITH_TESTS=ON
+ * run CMake configuration:
+  * on Linux or Mac OS X:
+    cmake .. -DCMAKE_BUILD_TYPE=[Release|Debug] [-DCMAKE_INSTALL_PREFIX=<install_dir>] [-DWITH_THIN_CLIENT=ON]
+          [-DWITH_ODBC=ON] [-DWITH_TESTS=ON]
+  * on Windows:
+    cmake .. -DCMAKE_GENERATOR_PLATFORM=[Win32|x64] [-DCMAKE_INSTALL_PREFIX=<install_dir>] [-DWITH_THIN_CLIENT=ON]
+          [-DWITH_ODBC=ON] [-DWITH_TESTS=ON]
+
+    CMake by default generate on Windows Visual Studio projects. You can find generated projects in CMake
+    build directory (./cmake-build-[release|debug]) and open Ignite.C++.sln in Visual Studio.
+ * cmake --build . --target install --config [Release|Debug]
+
+Testing:
+ Tests are disabled by default, you can enable them by setting CMake option -DWITH_TESTS=ON.
+ For building tests, boost framework is required. The following boost libraries are used:
+  * boost_unit_test_framework
+  * boost_thread
+  * boost_system
+  * boost_chrono
+  * boost_regex
+
+ BOOST_ROOT environment variable must be set to boost installation directory.
 
 Running test:
  * For core tests: ctest -V -R IgniteCoreTest
@@ -52,71 +75,32 @@ Running test:
 WARNING!
  * For running ODBC tests, ODBC driver must be installed in driver manager. See odbc/README.txt for details.
  * On Mac OS X Homebrew doesn't create symlinks for OpenSSL, so they should be created or as alternative
-   OPEN_SSL_HOME should be set before running ODBC or thin-client tests.
-
-Building on Windows with Visual Studio (tm)
-----------------------------------
-
-Common Requirements:
-
- * Microsoft Visual Studio (tm) 2010 or later
- * Windows SDK 7.1
- * Java Development Kit (JDK) must be installed: https://java.com/en/download/index.jsp
- * JAVA_HOME environment variable must be set pointing to Java installation directory.
- * IGNITE_HOME environment variable must be set to Ignite installation directory.
+   OPENSSL_HOME should be set before running ODBC or thin-client tests.
 
-Building binaries:
-
- * Open and build %IGNITE_HOME%\platforms\cpp\project\vs\ignite.sln (or ignite_86.sln if
-   you are running 32-bit platform).
- * If you want to build ODBC driver then you should explicitly build it as it is disabled
-   in the solution file by default. In IDE it can be done by clicking on the ODBC project
-   with the right mouse button and choosing "Build" option.
-
-Building tests:
-
-You may either download boost with pre-built libraries or download source code and build
-it by yourself. The details can be found by the following web link:
-https://www.boost.org/doc/libs/1_68_0/more/getting_started/windows.html
-
-It is also required to set following enviroment variables for Visual Studio solution to
-be able to locate boost libraries:
- * BOOST_HOME - path to the directory that contains "boost" directory with header files.
- * BOOST_LIB64_PATH - path to the directory that contains 64-bit libraries. Only requred
-   to build 64-bit Ignite libraries.
- * BOOST_LIB32_PATH - path to the directory that contains 32-bit libraries. Only requred
-   to build 32-bit Ignite libraries.
- * BOOST_LIB_SUFIX_D32 - sufix for debug 32-bit boost liraries. For example for library
-   'libboost_chrono-vc100-mt-gd-x32-1_68.lib' the sufix is 'vc100-mt-gd-x32-1_68'.
- * BOOST_LIB_SUFIX_R32 - sufix for release 32-bit boost liraries. For example for library
-   'libboost_system-vc141-mt-x32-1_68.lib' the sufix is 'vc141-mt-x32-1_68'.
- * BOOST_LIB_SUFIX_D64 - sufix for debug 64-bit boost liraries. For example for library
-   'libboost_unit_test_framework-vc140-mt-gd-x64-1_68.lib' the sufix is
-   'vc140-mt-gd-x64-1_68'.
- * BOOST_LIB_SUFIX_R64 - sufix for release 64-bit boost liraries. For example for library
-   'libboost_thread-vc100-mt-1_58.lib' the sufix is 'vc100-mt-1_58'.
-
-Building installers:
 
+Building ODBC Installers on Windows:
+------------------------------------
  * Install WiX Toolset if you do not have it yet.
  * Add WiX Toolset "bin" directory to your PATH environmental variable.
- * Build ODBC drivers: Release|x64 for 64-bit version and Release|Win32 for 32-bit version.
- * Open terminal and navigate to the directory $IGNITE_HOME/platforms/cpp/odbc/install
- * Execute the following commands one by one to build 32-bit driver:
-    * candle.exe ignite-odbc-x86.wxs
-    * light.exe -ext WixUIExtension ignite-odbc-x86.wixobj
- * Execute the following commands one by one to build 64-bit driver:
-    * candle.exe ignite-odbc-amd64.wxs
-    * light.exe -ext WixUIExtension ignite-odbc-amd64.wixobj
+ * Navigate to the directory $IGNITE_HOME/platforms/cpp
+ * mkdir cmake-build-release-[32|64]
+ * cd ./cmake-build-release-[32|64]
+ * Run CMake configuration:
+    cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_GENERATOR_PLATFORM=[Win32|x64] -
+       -DCMAKE_INSTALL_PREFIX=<install_dir> -DWITH_CORE=OFF -DWITH_ODBC=ON -DWITH_ODBC_MSI=ON
+ * cmake --build . --target install --config Release
+
+ODBC msi installers will be located in <install_dir>/bin
+
 
-Building in later versions of Visual Studio:
+Importing CMake projects to Visual Studio (tm) (since 2015):
+------------------------------------------------------------
+ Use CMakeSettings.json.in files in root directory as a template real CMakeSettings.json.
+ Edit it manually to set up correct environment variables and import CMake projects as usual.
 
- * Open project\vs\ignite.sln or project\vs\ignite_86.sln in Visual Studio
- * You will be prompted to "Update VC++ Compiler and Libraries", click "Update"
- * Build the solution.
 
 Building with QT Creator (tm):
---------------------------
+------------------------------
  * File -> Open file or project -> and choose from ($IGNITE_HOME/modules/platforms) CMakeLists.txt
  * If you have no $JAVA_HOME env variable, you need to append it.
  * Additionally for odbc-test or thin-client-test you need to append IGNITE_NATIVE_TEST_CPP_THIN_CONFIG_PATH and set it 
diff --git a/modules/platforms/cpp/binary/CMakeLists.txt b/modules/platforms/cpp/binary/CMakeLists.txt
index c69d6e3..59d3d46 100644
--- a/modules/platforms/cpp/binary/CMakeLists.txt
+++ b/modules/platforms/cpp/binary/CMakeLists.txt
@@ -71,5 +71,9 @@ foreach(_target_lib IN LISTS _target_libs)
 endforeach()
 unset(_target_libs)
 
-install(TARGETS ${TARGET} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET} 
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h*")
diff --git a/modules/platforms/cpp/binary/project/vs/binary.vcxproj b/modules/platforms/cpp/binary/project/vs/binary.vcxproj
deleted file mode 100644
index c973204..0000000
--- a/modules/platforms/cpp/binary/project/vs/binary.vcxproj
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4F15669B-92EB-49F0-B774-8F19BAE0B960}</ProjectGuid>
-    <RootNamespace>binary</RootNamespace>
-    <ProjectName>binary</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>ignite.binary</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>ignite.binary</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>ignite.binary</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>ignite.binary</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\binary\binary.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_consts.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_containers.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_enum.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_object.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_raw_reader.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_raw_writer.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_reader.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_type.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_writer.h" />
-    <ClInclude Include="..\..\include\ignite\binary\binary_enum_entry.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_common.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_field_meta.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_id_resolver.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_object_header.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_object_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_reader_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_schema.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_handler.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_manager.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_snapshot.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_updater.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_utils.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_writer_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop.h" />
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_input_stream.h" />
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_memory.h" />
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_output_stream.h" />
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_stream_position_guard.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\binary\binary_containers.cpp" />
-    <ClCompile Include="..\..\src\binary\binary_raw_reader.cpp" />
-    <ClCompile Include="..\..\src\binary\binary_raw_writer.cpp" />
-    <ClCompile Include="..\..\src\binary\binary_reader.cpp" />
-    <ClCompile Include="..\..\src\binary\binary_type.cpp" />
-    <ClCompile Include="..\..\src\binary\binary_writer.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_field_meta.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_object_header.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_object_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_reader_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_schema.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_type_handler.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_type_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_type_manager.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_type_snapshot.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_utils.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_writer_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\interop\interop_input_stream.cpp" />
-    <ClCompile Include="..\..\src\impl\interop\interop_memory.cpp" />
-    <ClCompile Include="..\..\src\impl\interop\interop_output_stream.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/binary/project/vs/binary.vcxproj.filters b/modules/platforms/cpp/binary/project/vs/binary.vcxproj.filters
deleted file mode 100644
index e6528ea..0000000
--- a/modules/platforms/cpp/binary/project/vs/binary.vcxproj.filters
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Code\binary">
-      <UniqueIdentifier>{1815eb01-65f5-4142-b773-06abf2dcd0af}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl">
-      <UniqueIdentifier>{7cb1d41b-cf13-4c88-a663-3d74f0bd1b52}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\binary">
-      <UniqueIdentifier>{12775752-54bd-4c9c-b890-0252b2f221b5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\interop">
-      <UniqueIdentifier>{d41f0ecd-360a-4a59-a5fb-98db54a3e170}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\binary\binary.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_consts.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_containers.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_raw_reader.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_raw_writer.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_reader.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_type.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_writer.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_common.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_id_resolver.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_reader_impl.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_schema.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_handler.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_manager.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_snapshot.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_updater.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_utils.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_writer_impl.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop.h">
-      <Filter>Code\impl\interop</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_input_stream.h">
-      <Filter>Code\impl\interop</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_memory.h">
-      <Filter>Code\impl\interop</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_output_stream.h">
-      <Filter>Code\impl\interop</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_stream_position_guard.h">
-      <Filter>Code\impl\interop</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_object.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_object_header.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_object_impl.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_field_meta.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_impl.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_enum_entry.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary\binary_enum.h">
-      <Filter>Code\binary</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\binary\binary_containers.cpp">
-      <Filter>Code\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary\binary_raw_reader.cpp">
-      <Filter>Code\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary\binary_raw_writer.cpp">
-      <Filter>Code\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary\binary_reader.cpp">
-      <Filter>Code\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary\binary_type.cpp">
-      <Filter>Code\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary\binary_writer.cpp">
-      <Filter>Code\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_reader_impl.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_schema.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_type_handler.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_type_manager.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_type_snapshot.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_utils.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_writer_impl.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\interop\interop_input_stream.cpp">
-      <Filter>Code\impl\interop</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\interop\interop_memory.cpp">
-      <Filter>Code\impl\interop</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\interop\interop_output_stream.cpp">
-      <Filter>Code\impl\interop</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_object_header.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_object_impl.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_field_meta.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_type_impl.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/common/CMakeLists.txt b/modules/platforms/cpp/common/CMakeLists.txt
index 9d40af9..ef1bbe3 100644
--- a/modules/platforms/cpp/common/CMakeLists.txt
+++ b/modules/platforms/cpp/common/CMakeLists.txt
@@ -79,5 +79,9 @@ foreach(_target_lib IN LISTS _target_libs)
 endforeach()
 unset(_target_libs)
 
-install(TARGETS ${TARGET} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET} 
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+)
 install(DIRECTORY include/ ${OS_INCLUDE}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h*")
diff --git a/modules/platforms/cpp/common/project/README.TXT b/modules/platforms/cpp/common/project/README.TXT
deleted file mode 100644
index 97f4c64..0000000
--- a/modules/platforms/cpp/common/project/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains IDE projects artifacts.
diff --git a/modules/platforms/cpp/common/project/vs/README.TXT b/modules/platforms/cpp/common/project/vs/README.TXT
deleted file mode 100644
index f4fb456..0000000
--- a/modules/platforms/cpp/common/project/vs/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains Visual Studio project artifacts.
\ No newline at end of file
diff --git a/modules/platforms/cpp/common/project/vs/common.vcxproj b/modules/platforms/cpp/common/project/vs/common.vcxproj
deleted file mode 100644
index 438d991..0000000
--- a/modules/platforms/cpp/common/project/vs/common.vcxproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B63F2E01-5157-4719-8491-0E1C7CD3B701}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>common</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>ignite.common</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>ignite.common</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>ignite.common</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>ignite.common</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <StringPooling>true</StringPooling>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\common\big_integer.h" />
-    <ClInclude Include="..\..\include\ignite\common\cancelable.h" />
-    <ClInclude Include="..\..\include\ignite\common\concurrent.h" />
-    <ClInclude Include="..\..\include\ignite\common\decimal.h" />
-    <ClInclude Include="..\..\include\ignite\common\default_allocator.h" />
-    <ClInclude Include="..\..\include\ignite\common\dynamic_size_array.h" />
-    <ClInclude Include="..\..\include\ignite\common\expected.h" />
-    <ClInclude Include="..\..\include\ignite\common\fixed_size_array.h" />
-    <ClInclude Include="..\..\include\ignite\common\bits.h" />
-    <ClInclude Include="..\..\include\ignite\common\lazy.h" />
-    <ClInclude Include="..\..\include\ignite\common\platform_utils.h" />
-    <ClInclude Include="..\..\include\ignite\common\promise.h" />
-    <ClInclude Include="..\..\include\ignite\common\reference_impl.h" />
-    <ClInclude Include="..\..\include\ignite\common\shared_state.h" />
-    <ClInclude Include="..\..\include\ignite\common\utils.h" />
-    <ClInclude Include="..\..\include\ignite\date.h" />
-    <ClInclude Include="..\..\include\ignite\future.h" />
-    <ClInclude Include="..\..\include\ignite\guid.h" />
-    <ClInclude Include="..\..\include\ignite\ignite_error.h" />
-    <ClInclude Include="..\..\include\ignite\ignite_predicate.h" />
-    <ClInclude Include="..\..\include\ignite\reference.h" />
-    <ClInclude Include="..\..\include\ignite\time.h" />
-    <ClInclude Include="..\..\include\ignite\timestamp.h" />
-    <ClInclude Include="..\..\os\win\include\ignite\common\common.h" />
-    <ClInclude Include="..\..\os\win\include\ignite\common\concurrent_os.h" />
-    <ClInclude Include="..\..\os\win\include\ignite\common\dynamic_load_os.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\os\win\src\common\concurrent_os.cpp" />
-    <ClCompile Include="..\..\os\win\src\common\dynamic_load_os.cpp" />
-    <ClCompile Include="..\..\os\win\src\common\platform_utils.cpp" />
-    <ClCompile Include="..\..\src\common\big_integer.cpp" />
-    <ClCompile Include="..\..\src\common\bits.cpp" />
-    <ClCompile Include="..\..\src\common\concurrent.cpp" />
-    <ClCompile Include="..\..\src\common\decimal.cpp" />
-    <ClCompile Include="..\..\src\common\utils.cpp" />
-    <ClCompile Include="..\..\src\date.cpp" />
-    <ClCompile Include="..\..\src\guid.cpp" />
-    <ClCompile Include="..\..\src\ignite_error.cpp" />
-    <ClCompile Include="..\..\src\time.cpp" />
-    <ClCompile Include="..\..\src\timestamp.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/common/project/vs/common.vcxproj.filters b/modules/platforms/cpp/common/project/vs/common.vcxproj.filters
deleted file mode 100644
index f68f807..0000000
--- a/modules/platforms/cpp/common/project/vs/common.vcxproj.filters
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Code\common">
-      <UniqueIdentifier>{9d664b8a-3a09-460b-9d53-c1a7f08217c0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\os\win\include\ignite\common\common.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\concurrent.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\utils.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\os\win\include\ignite\common\concurrent_os.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\date.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\guid.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\timestamp.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignite_error.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\fixed_size_array.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\big_integer.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\dynamic_size_array.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\default_allocator.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\bits.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\decimal.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\reference_impl.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\reference.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\os\win\include\ignite\common\dynamic_load_os.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\platform_utils.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\time.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\future.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\promise.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\shared_state.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\cancelable.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\lazy.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\common\expected.h">
-      <Filter>Code\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignite_predicate.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\date.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\guid.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\timestamp.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\common\concurrent_os.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\concurrent.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ignite_error.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\big_integer.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\decimal.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\bits.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\common\dynamic_load_os.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\common\platform_utils.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\utils.cpp">
-      <Filter>Code\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\time.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/core-test/project/README.TXT b/modules/platforms/cpp/core-test/project/README.TXT
deleted file mode 100644
index 97f4c64..0000000
--- a/modules/platforms/cpp/core-test/project/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains IDE projects artifacts.
diff --git a/modules/platforms/cpp/core-test/project/vs/README.TXT b/modules/platforms/cpp/core-test/project/vs/README.TXT
deleted file mode 100644
index f4fb456..0000000
--- a/modules/platforms/cpp/core-test/project/vs/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains Visual Studio project artifacts.
\ No newline at end of file
diff --git a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
deleted file mode 100644
index d1a9e62..0000000
--- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\binary\project\vs\binary.vcxproj">
-      <Project>{4f15669b-92eb-49f0-b774-8f19bae0b960}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\project\vs\core.vcxproj">
-      <Project>{e2dea693-f2ea-43c2-a813-053378f6e4db}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\jni\project\vs\jni.vcxproj">
-      <Project>{4f7e4917-4612-4b96-9838-025711ade391}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\config\cache-identity.xml" />
-    <Xml Include="..\..\config\cache-identity-32.xml" />
-    <Xml Include="..\..\config\cache-identity-default.xml" />
-    <Xml Include="..\..\config\cache-query.xml" />
-    <Xml Include="..\..\config\cache-query-32.xml" />
-    <Xml Include="..\..\config\cache-query-default.xml" />
-    <Xml Include="..\..\config\cache-store.xml" />
-    <Xml Include="..\..\config\cache-store-32.xml" />
-    <Xml Include="..\..\config\cache-store-default.xml" />
-    <Xml Include="..\..\config\cache-test.xml" />
-    <Xml Include="..\..\config\cache-test-32.xml" />
-    <Xml Include="..\..\config\cache-test-default.xml" />
-    <Xml Include="..\..\config\cache-query-continuous.xml" />
-    <Xml Include="..\..\config\cache-query-continuous-32.xml" />
-    <Xml Include="..\..\config\cache-query-continuous-default.xml" />
-    <Xml Include="..\..\config\isolated.xml" />
-    <Xml Include="..\..\config\isolated-32.xml" />
-    <Xml Include="..\..\config\isolated-default.xml" />
-    <Xml Include="..\..\config\persistence-store.xml" />
-    <Xml Include="..\..\config\persistence-store-32.xml" />
-    <Xml Include="..\..\config\persistence-store-default.xml" />
-    <Xml Include="..\..\config\invalid.xml" />
-    <Xml Include="..\..\config\interop.xml" />
-    <Xml Include="..\..\config\interop-32.xml" />
-    <Xml Include="..\..\config\interop-default.xml" />
-    <Xml Include="..\..\config\cache-native-persistence-test-32.xml" />
-    <Xml Include="..\..\config\cache-native-persistence-test-default.xml" />
-    <Xml Include="..\..\config\cache-native-persistence-test.xml" />
-    <Xml Include="..\..\config\compute-client-32.xml" />
-    <Xml Include="..\..\config\compute-client-default.xml" />
-    <Xml Include="..\..\config\compute-client.xml" />
-    <Xml Include="..\..\config\compute-server0-32.xml" />
-    <Xml Include="..\..\config\compute-server0-default.xml" />
-    <Xml Include="..\..\config\compute-server0.xml" />
-    <Xml Include="..\..\config\compute-server1-32.xml" />
-    <Xml Include="..\..\config\compute-server1-default.xml" />
-    <Xml Include="..\..\config\compute-server1.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\affinity_test.cpp" />
-    <ClCompile Include="..\..\src\binary_object_test.cpp" />
-    <ClCompile Include="..\..\src\binary_identity_resolver_test.cpp" />
-    <ClCompile Include="..\..\src\cache_store_test.cpp" />
-    <ClCompile Include="..\..\src\cache_test.cpp" />
-    <ClCompile Include="..\..\src\cache_invoke_test.cpp" />
-    <ClCompile Include="..\..\src\cluster_group_test.cpp" />
-    <ClCompile Include="..\..\src\cluster_node_test.cpp" />
-    <ClCompile Include="..\..\src\cluster_test.cpp" />
-    <ClCompile Include="..\..\src\compute_test.cpp" />
-    <ClCompile Include="..\..\src\concurrent_test.cpp" />
-    <ClCompile Include="..\..\src\date_time_test.cpp" />
-    <ClCompile Include="..\..\src\decimal_test.cpp" />
-    <ClCompile Include="..\..\src\dynamic_size_array_test.cpp" />
-    <ClCompile Include="..\..\src\fixed_size_array_test.cpp" />
-    <ClCompile Include="..\..\src\continuous_query_test.cpp" />
-    <ClCompile Include="..\..\src\future_test.cpp" />
-    <ClCompile Include="..\..\src\ignite_error_test.cpp" />
-    <ClCompile Include="..\..\src\ignition_test.cpp" />
-    <ClCompile Include="..\..\src\handle_registry_test.cpp" />
-    <ClCompile Include="..\..\src\binary_reader_writer_raw_test.cpp" />
-    <ClCompile Include="..\..\src\binary_reader_writer_test.cpp" />
-    <ClCompile Include="..\..\src\binary_session_test.cpp" />
-    <ClCompile Include="..\..\src\binary_test_defs.cpp" />
-    <ClCompile Include="..\..\src\cache_query_test.cpp" />
-    <ClCompile Include="..\..\src\interop_memory_test.cpp" />
-    <ClCompile Include="..\..\src\interop_test.cpp" />
-    <ClCompile Include="..\..\src\bits_test.cpp" />
-    <ClCompile Include="..\..\src\reference_test.cpp" />
-    <ClCompile Include="..\..\src\teamcity_boost.cpp" />
-    <ClCompile Include="..\..\src\teamcity_messages.cpp" />
-    <ClCompile Include="..\..\src\test_utils.cpp" />
-    <ClCompile Include="..\..\src\transactions_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\binary_test_defs.h" />
-    <ClInclude Include="..\..\include\ignite\binary_test_utils.h" />
-    <ClInclude Include="..\..\include\ignite\complex_type.h" />
-    <ClInclude Include="..\..\include\ignite\compute_types.h" />
-    <ClInclude Include="..\..\include\ignite\test_type.h" />
-    <ClInclude Include="..\..\include\ignite\test_utils.h" />
-    <ClInclude Include="..\..\include\teamcity_messages.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}</ProjectGuid>
-    <RootNamespace>coretest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(BOOST_LIB64_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_system-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_D64).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(BOOST_LIB32_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_system-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_D32).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(BOOST_LIB64_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_system-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_R64).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(BOOST_LIB32_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_system-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_R32).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters
deleted file mode 100644
index bac4262..0000000
--- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\src\cache_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\concurrent_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ignition_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\handle_registry_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cache_query_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\teamcity_boost.cpp">
-      <Filter>TeamCity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\teamcity_messages.cpp">
-      <Filter>TeamCity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary_test_defs.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary_session_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary_reader_writer_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary_reader_writer_raw_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\interop_memory_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ignite_error_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\transactions_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bits_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\decimal_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\fixed_size_array_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\dynamic_size_array_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cache_invoke_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\interop_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\continuous_query_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\reference_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary_object_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary_identity_resolver_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\test_utils.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\date_time_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cache_store_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\future_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compute_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compute_java_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compute_java_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cluster_group_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cluster_node_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cluster_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\affinity_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\teamcity_messages.h">
-      <Filter>TeamCity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary_test_utils.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\complex_type.h">
-      <Filter>Code\Types</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\compute_types.h">
-      <Filter>Code\Types</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\test_type.h">
-      <Filter>Code\Types</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\binary_test_defs.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\test_utils.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{486c367c-57e9-430a-80f0-39fd5b09bc64}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Configs">
-      <UniqueIdentifier>{a46d9d4c-44eb-40da-b4f6-89cc43b70c12}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="TeamCity">
-      <UniqueIdentifier>{76bceab0-e251-445f-88c3-3f6f8739423b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\Types">
-      <UniqueIdentifier>{fb43524e-3694-44ee-b153-770cd9cf6c7a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\config\invalid.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\interop.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\interop-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\interop-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-test.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-test-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-test-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-query.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-query-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-query-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-query-continuous.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-query-continuous-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-query-continuous-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-identity.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-identity-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-identity-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-store.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-store-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-store-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\isolated.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\isolated-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\isolated-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\persistence-store.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\persistence-store-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\persistence-store-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-client.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-client-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-client-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-server0.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-server0-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-server0-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-server1.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-server1-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-server1-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-native-persistence-test.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-native-persistence-test-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-native-persistence-test-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/core/CMakeLists.txt b/modules/platforms/cpp/core/CMakeLists.txt
index 6060051..429e95b 100644
--- a/modules/platforms/cpp/core/CMakeLists.txt
+++ b/modules/platforms/cpp/core/CMakeLists.txt
@@ -61,5 +61,9 @@ target_link_libraries(${TARGET} ignite-binary ignite-jni)
 
 target_include_directories(${TARGET} INTERFACE include)
 
-install(TARGETS ${TARGET} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET} 
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h*")
diff --git a/modules/platforms/cpp/core/project/README.TXT b/modules/platforms/cpp/core/project/README.TXT
deleted file mode 100644
index 97f4c64..0000000
--- a/modules/platforms/cpp/core/project/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains IDE projects artifacts.
diff --git a/modules/platforms/cpp/core/project/vs/README.TXT b/modules/platforms/cpp/core/project/vs/README.TXT
deleted file mode 100644
index f4fb456..0000000
--- a/modules/platforms/cpp/core/project/vs/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains Visual Studio project artifacts.
\ No newline at end of file
diff --git a/modules/platforms/cpp/core/project/vs/core.vcxproj b/modules/platforms/cpp/core/project/vs/core.vcxproj
deleted file mode 100644
index db0455c..0000000
--- a/modules/platforms/cpp/core/project/vs/core.vcxproj
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E2DEA693-F2EA-43C2-A813-053378F6E4DB}</ProjectGuid>
-    <RootNamespace>core</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>ignite.core</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>ignite.core</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>ignite.core</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>ignite.core</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\cache\cache.h" />
-    <ClInclude Include="..\..\include\ignite\cache\cache_affinity.h" />
-    <ClInclude Include="..\..\include\ignite\cache\cache_entry.h" />
-    <ClInclude Include="..\..\include\ignite\cache\cache_entry_processor.h" />
-    <ClInclude Include="..\..\include\ignite\cache\cache_peek_mode.h" />
-    <ClInclude Include="..\..\include\ignite\cache\event\cache_entry_event.h" />
-    <ClInclude Include="..\..\include\ignite\cache\event\cache_entry_event_filter.h" />
-    <ClInclude Include="..\..\include\ignite\cache\event\cache_entry_event_listener.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\continuous\continuous_query.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\continuous\continuous_query_handle.h" />
-    <ClInclude Include="..\..\include\ignite\cache\mutable_cache_entry.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query_cursor.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query_fields_cursor.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query_fields_row.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query_scan.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query_sql.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query_sql_fields.h" />
-    <ClInclude Include="..\..\include\ignite\cache\query\query_text.h" />
-    <ClInclude Include="..\..\include\ignite\cluster\cluster_group.h" />
-    <ClInclude Include="..\..\include\ignite\cluster\cluster_node.h" />
-    <ClInclude Include="..\..\include\ignite\cluster\ignite_cluster.h" />
-    <ClInclude Include="..\..\include\ignite\compute\compute.h" />
-    <ClInclude Include="..\..\include\ignite\compute\compute_func.h" />
-    <ClInclude Include="..\..\include\ignite\ignite_binding_context.h" />
-    <ClInclude Include="..\..\include\ignite\ignite.h" />
-    <ClInclude Include="..\..\include\ignite\ignite_configuration.h" />
-    <ClInclude Include="..\..\include\ignite\ignite_product_version.h" />
-    <ClInclude Include="..\..\include\ignite\ignition.h" />
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_updater_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\bindings.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\cache_affinity_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\cache_entry_processor_holder.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\cache_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_argument.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\event\cache_entry_event_filter_base.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\event\cache_entry_event_filter_holder.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_batch.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\continuous\continuous_query_handle_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\continuous\continuous_query_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_fields_row_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cluster\cluster_group_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cluster\cluster_node_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\cluster\ignite_cluster_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\cancelable_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_job_holder.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_job_result.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_task_holder.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\java_compute_task_holder.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\multiple_job_compute_task_holder.h" />
-    <ClInclude Include="..\..\include\ignite\impl\compute\single_job_compute_task_holder.h" />
-    <ClInclude Include="..\..\include\ignite\impl\helpers.h" />
-    <ClInclude Include="..\..\include\ignite\impl\ignite_environment.h" />
-    <ClInclude Include="..\..\include\ignite\impl\ignite_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\handle_registry.h" />
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_external_memory.h" />
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_target.h" />
-    <ClInclude Include="..\..\include\ignite\impl\ignite_binding_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\module_manager.h" />
-    <ClInclude Include="..\..\include\ignite\impl\operations.h" />
-    <ClInclude Include="..\..\include\ignite\impl\transactions\transactions_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\transactions\transaction_impl.h" />
-    <ClInclude Include="..\..\include\ignite\ignite_binding.h" />
-    <ClInclude Include="..\..\include\ignite\transactions\transaction.h" />
-    <ClInclude Include="..\..\include\ignite\transactions\transactions.h" />
-    <ClInclude Include="..\..\include\ignite\transactions\transaction_consts.h" />
-    <ClInclude Include="..\..\include\ignite\transactions\transaction_metrics.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\cluster\cluster_group.cpp" />
-    <ClCompile Include="..\..\src\cluster\cluster_node.cpp" />
-    <ClCompile Include="..\..\src\cluster\ignite_cluster.cpp" />
-    <ClCompile Include="..\..\src\ignite.cpp" />
-    <ClCompile Include="..\..\src\ignition.cpp" />
-    <ClCompile Include="..\..\src\impl\binary\binary_type_updater_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cache\cache_affinity_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cache\cache_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cache\query\query_batch.cpp" />
-    <ClCompile Include="..\..\src\impl\cache\query\continuous\continuous_query_handle_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cache\query\query_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cluster\cluster_group_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cluster\cluster_node_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cluster\ignite_cluster_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\compute\cancelable_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\compute\compute_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\ignite_binding_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\ignite_environment.cpp" />
-    <ClCompile Include="..\..\src\impl\ignite_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\handle_registry.cpp" />
-    <ClCompile Include="..\..\src\impl\interop\interop_external_memory.cpp" />
-    <ClCompile Include="..\..\src\impl\interop\interop_target.cpp" />
-    <ClCompile Include="..\..\src\impl\transactions\transactions_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\transactions\transaction_impl.cpp" />
-    <ClCompile Include="..\..\src\transactions\transaction.cpp" />
-    <ClCompile Include="..\..\src\transactions\transactions.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\binary\project\vs\binary.vcxproj">
-      <Project>{4f15669b-92eb-49f0-b774-8f19bae0b960}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\jni\project\vs\jni.vcxproj">
-      <Project>{4f7e4917-4612-4b96-9838-025711ade391}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/core/project/vs/core.vcxproj.filters b/modules/platforms/cpp/core/project/vs/core.vcxproj.filters
deleted file mode 100644
index 3853390..0000000
--- a/modules/platforms/cpp/core/project/vs/core.vcxproj.filters
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\src\impl\cache\cache_impl.cpp">
-      <Filter>Code\impl\cache</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\ignite_impl.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ignite.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ignition.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\handle_registry.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cache\query\query_impl.cpp">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\ignite_environment.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\interop\interop_external_memory.cpp">
-      <Filter>Code\impl\interop</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\binary\binary_type_updater_impl.cpp">
-      <Filter>Code\impl\binary</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\transactions\transactions_impl.cpp">
-      <Filter>Code\impl\transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\transactions\transactions.cpp">
-      <Filter>Code\transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\transactions\transaction_impl.cpp">
-      <Filter>Code\impl\transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\transactions\transaction.cpp">
-      <Filter>Code\transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\interop\interop_target.cpp">
-      <Filter>Code\impl\interop</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cache\query\query_batch.cpp">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cache\query\continuous\continuous_query_handle_impl.cpp">
-      <Filter>Code\impl\cache\query\continuous</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cluster\cluster_group_impl.cpp">
-      <Filter>Code\impl\cluster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\ignite_binding_impl.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\compute\compute_impl.cpp">
-      <Filter>Code\impl\compute</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\compute\cancelable_impl.cpp">
-      <Filter>Code\impl\compute</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cluster\ignite_cluster_impl.cpp">
-      <Filter>Code\impl\cluster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cluster\cluster_node_impl.cpp">
-      <Filter>Code\impl\cluster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cluster\cluster_node.cpp">
-      <Filter>Code\cluster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cluster\cluster_group.cpp">
-      <Filter>Code\cluster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cluster\ignite_cluster.cpp">
-      <Filter>Code\cluster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cache\cache_affinity_impl.cpp">
-      <Filter>Code\impl\cache</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\impl\cache\cache_impl.h">
-      <Filter>Code\impl\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\cache.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\cache_peek_mode.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\ignite_impl.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\operations.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignite.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignite_configuration.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignition.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\handle_registry.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\cache_entry.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_impl.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query_cursor.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query_sql.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query_text.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query_scan.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query_sql_fields.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query_fields_cursor.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\query_fields_row.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_fields_row_impl.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\ignite_environment.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\binary\binary_type_updater_impl.h">
-      <Filter>Code\impl\binary</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_external_memory.h">
-      <Filter>Code\impl\interop</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\transactions\transactions_impl.h">
-      <Filter>Code\impl\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\transactions\transactions.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\transactions\transaction.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\transactions\transaction_impl.h">
-      <Filter>Code\impl\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\transactions\transaction_consts.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\transactions\transaction_metrics.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\interop\interop_target.h">
-      <Filter>Code\impl\interop</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_batch.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\continuous\continuous_query_handle.h">
-      <Filter>Code\cache\query\continuous</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\query\continuous\continuous_query.h">
-      <Filter>Code\cache\query\continuous</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\continuous\continuous_query_handle_impl.h">
-      <Filter>Code\impl\cache\query\continuous</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\event\cache_entry_event_listener.h">
-      <Filter>Code\cache\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\event\cache_entry_event.h">
-      <Filter>Code\cache\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\continuous\continuous_query_impl.h">
-      <Filter>Code\impl\cache\query\continuous</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\mutable_cache_entry.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\cache_entry_processor_holder.h">
-      <Filter>Code\impl\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\module_manager.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cluster\cluster_group_impl.h">
-      <Filter>Code\impl\cluster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\cache_entry_processor.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignite_binding.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\ignite_binding_impl.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignite_binding_context.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\query\query_argument.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\event\cache_entry_event_filter.h">
-      <Filter>Code\cache\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\event\cache_entry_event_filter_base.h">
-      <Filter>Code\impl\cache\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\event\cache_entry_event_filter_holder.h">
-      <Filter>Code\impl\cache\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\bindings.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\helpers.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\compute\compute.h">
-      <Filter>Code\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_impl.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\compute\compute_func.h">
-      <Filter>Code\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\cancelable_impl.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_job_holder.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_job_result.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\compute_task_holder.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\java_compute_task_holder.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\single_job_compute_task_holder.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\compute\multiple_job_compute_task_holder.h">
-      <Filter>Code\impl\compute</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cluster\ignite_cluster_impl.h">
-      <Filter>Code\impl\cluster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cluster\cluster_node_impl.h">
-      <Filter>Code\impl\cluster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cluster\cluster_node.h">
-      <Filter>Code\cluster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cluster\cluster_group.h">
-      <Filter>Code\cluster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cluster\ignite_cluster.h">
-      <Filter>Code\cluster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\ignite_product_version.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\cache\cache_affinity_impl.h">
-      <Filter>Code\impl\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\cache\cache_affinity.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{91873c79-a64f-4786-ab25-d03ef2db9dc8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl">
-      <UniqueIdentifier>{9bede404-e1b1-44d6-b54d-e9b2441c5f13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\cache">
-      <UniqueIdentifier>{b013b0f6-c4b8-4b88-89bc-8b394971788e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\cache">
-      <UniqueIdentifier>{8b7e32c0-e222-4f3a-af31-19df380c369f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\cache\query">
-      <UniqueIdentifier>{4658a0ff-0d2d-45a6-b8de-93eeec0cc081}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\cache\query">
-      <UniqueIdentifier>{b6e57294-120a-46f2-b0ad-c3595e2cf789}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\interop">
-      <UniqueIdentifier>{ef4515c8-aa3d-44d4-b53d-26d18f465903}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\binary">
-      <UniqueIdentifier>{25234d34-541b-4f6c-b42a-cc96ee33a928}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\transactions">
-      <UniqueIdentifier>{d6f8a3d2-db0e-45ff-9f39-d1f1fa8771f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\transactions">
-      <UniqueIdentifier>{146fe661-0ad3-4d51-83a3-fce8a897e84d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\cache\query\continuous">
-      <UniqueIdentifier>{2056dfc8-4ced-4658-b2b7-a8c81a7ef797}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\cache\query\continuous">
-      <UniqueIdentifier>{d633f819-7b30-4e26-81ec-f708d1c1ff8e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\cache\event">
-      <UniqueIdentifier>{e03c3690-ff22-4c78-83a0-b77cebb7f980}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\cluster">
-      <UniqueIdentifier>{f5b54635-91a1-447e-923a-1b4608d7e5bc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\cache\event">
-      <UniqueIdentifier>{9c5e9732-755a-4553-8926-b4cf3b6abaf3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\compute">
-      <UniqueIdentifier>{f1b7ced1-0e6e-4e07-a5b6-04b076797c6f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\compute">
-      <UniqueIdentifier>{ef20cfe1-cd30-429d-a241-575696df8399}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\cluster">
-      <UniqueIdentifier>{45d247ce-364b-4eec-87dc-1ecbee6c6b03}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/CMakeSettings.json.in b/modules/platforms/cpp/examples/CMakeSettings.json.in
new file mode 100644
index 0000000..76a42d9
--- /dev/null
+++ b/modules/platforms/cpp/examples/CMakeSettings.json.in
@@ -0,0 +1,38 @@
+{
+  "environments": [
+    {
+      "JAVA_HOME": "<PATH_TO_JDK>",
+      "BuildDir": "${env.USERPROFILE}\\CMakeBuilds\\ignite-cpp-examples\\${workspaceHash}",
+      "IGNITE_CPP_DIR": "<PATH_TO_IGNITE_CPP>"
+    }
+  ],
+
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Visual Studio 15 2017 Win64",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64" ],
+      "buildRoot": "${env.BuildDir}}\\cmake-build-debug",
+      "variables": [
+        {
+          "name": "IGNITE_CPP_DIR",
+          "value": "${env.IGNITE_CPP_DIR}"
+        }
+      ]
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Visual Studio 15 2017 Win64",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x64" ],
+      "buildRoot": "${env.BuildDir}\\cmake-build-release",
+      "variables": [
+        {
+          "name": "IGNITE_CPP_DIR",
+          "value": "${env.IGNITE_CPP_DIR}"
+        }
+      ]
+    }
+  ]
+}
diff --git a/modules/platforms/cpp/examples/README.txt b/modules/platforms/cpp/examples/README.txt
index 148ce11..5957ea3 100644
--- a/modules/platforms/cpp/examples/README.txt
+++ b/modules/platforms/cpp/examples/README.txt
@@ -14,18 +14,31 @@ Common requirements
    $IGNITE_HOME/platforms/cpp/DEVNOTES.txt for build instructions and to $IGNITE_HOME/platforms/cpp/odbc/README.txt.
    for installation instructions.
 
-Running examples on Linux and MacOS
+Running examples.
 ----------------------------------
 
 Prerequisites:
- * GCC, g++, CMake >= 3.6 must be installed
+ * C++ compiler and SDK:
+  Linux and Mac OS X:
+   * clang >= 3.9 or gcc >= 3.6
+  Windows:
+   * Visual Studio 2010 or later
+   * Windows SDK 7.1 or later
+ * CMake >= 3.6 must be installed
  * Apache Ignite C++ should be installed. Refer to $IGNITE_HOME/platforms/cpp/DEVNOTES.txt for instructions.
 
 To build examples execute the following commands one by one from examples root directory:
- * mkdir cmake-build-release
- * cd ./cmake-build-release
- * cmake -DCMAKE_BUILD_TYPE=[Release|Debug] [-DIGNITE_CPP_DIR=<ignite_install_dir>] ..
- * make
+ * mkdir cmake-build-[debug|release]
+ * cd ./cmake-build-[debug|release]
+ * run CMake configuration:
+  * on Linux or Mac OS X:
+     cmake .. -DCMAKE_BUILD_TYPE=[Release|Debug] [-DIGNITE_CPP_DIR=<ignite_install_dir>]
+  * on Windows:
+     cmake .. -DCMAKE_GENERATOR_PLATFORM=[Win32|x64] [-DIGNITE_CPP_DIR=<ignite_install_dir>]
+ * cmake --build . --config [Release|Debug]
+
+CMake by default generate on Windows Visual Studio projects. You can find generated projects in CMake
+build directory (./cmake-build-[release|debug]) and open examples.sln in Visual Studio.
 
 If Apache Ignite C++ is installed in default directories (i.e. /usr/local or /usr), setting IGNITE_CPP_DIR property
 is not necessary. As a result executables will be in corresponding subdirectories in cmake-build-release directory.
@@ -33,12 +46,8 @@ is not necessary. As a result executables will be in corresponding subdirectorie
 For odbc-example additionaly ODBC Driver Manager must be present and installed on your platform and
 Apache Ignite ODBC driver must be built and installed according to instructions for your platform.
 
-Running examples on Windows
-----------------------------------
-
-Prerequisites:
- * Microsoft Visual Studio (tm) 2010 or higher must be installed.
- * Windows SDK 7.1 must be installed.
 
-Open Visual Studio solution %IGNITE_HOME%\platforms\cpp\examples\project\vs\ignite-examples.sln and select proper
-platform (x64 or x86). Run the solution.
+Importing CMake projects to Visual Studio (tm) (since 2015):
+------------------------------------------------------------
+ Use CMakeSettings.json.in files in examples root directory as a template of real CMakeSettings.json.
+ Edit it manually to set up correct environment variables and import CMake projects as usual.
diff --git a/modules/platforms/cpp/examples/cluster-compute-example/project/vs/cluster-compute-example.vcxproj b/modules/platforms/cpp/examples/cluster-compute-example/project/vs/cluster-compute-example.vcxproj
deleted file mode 100644
index 78a3b45..0000000
--- a/modules/platforms/cpp/examples/cluster-compute-example/project/vs/cluster-compute-example.vcxproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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">
-    <RootNamespace>igniteexamples</RootNamespace>
-    <ProjectGuid>{72787C8A-9F6F-434B-A01D-59E3BB6069BF}</ProjectGuid>
-    <ProjectName>cluster-compute-example</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\cluster_compute_example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\config\cluster-compute-example-client.xml" />
-    <Xml Include="..\..\config\cluster-compute-example1.xml" />
-    <Xml Include="..\..\config\cluster-compute-example2.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/cluster-compute-example/project/vs/cluster-compute-example.vcxproj.filters b/modules/platforms/cpp/examples/cluster-compute-example/project/vs/cluster-compute-example.vcxproj.filters
deleted file mode 100644
index 132ea31..0000000
--- a/modules/platforms/cpp/examples/cluster-compute-example/project/vs/cluster-compute-example.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FB}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFC}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD11}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\cluster_compute_example.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\config\cluster-compute-example1.xml">
-      <Filter>Config</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cluster-compute-example2.xml">
-      <Filter>Config</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cluster-compute-example-client.xml">
-      <Filter>Config</Filter>
-    </Xml>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/compute-example/project/vs/compute-example.vcxproj b/modules/platforms/cpp/examples/compute-example/project/vs/compute-example.vcxproj
deleted file mode 100644
index 1b84a9c..0000000
--- a/modules/platforms/cpp/examples/compute-example/project/vs/compute-example.vcxproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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">
-    <RootNamespace>igniteexamples</RootNamespace>
-    <ProjectGuid>{18BB0A18-8213-472A-81A0-9D9753697135}</ProjectGuid>
-    <ProjectName>compute-example</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\compute_example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\compute-example.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/compute-example/project/vs/compute-example.vcxproj.filters b/modules/platforms/cpp/examples/compute-example/project/vs/compute-example.vcxproj.filters
deleted file mode 100644
index d43cece..0000000
--- a/modules/platforms/cpp/examples/compute-example/project/vs/compute-example.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\compute_example.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\compute-example.xml">
-      <Filter>Config</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/continuous-query-example/project/vs/continuous-query-example.vcxproj b/modules/platforms/cpp/examples/continuous-query-example/project/vs/continuous-query-example.vcxproj
deleted file mode 100644
index 585796b..0000000
--- a/modules/platforms/cpp/examples/continuous-query-example/project/vs/continuous-query-example.vcxproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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">
-    <RootNamespace>igniteexamples</RootNamespace>
-    <ProjectGuid>{73BB124A-0CD4-4961-A6CD-61F9C71028A6}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\continuous_query_example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\continuous-query-example.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/continuous-query-example/project/vs/continuous-query-example.vcxproj.filters b/modules/platforms/cpp/examples/continuous-query-example/project/vs/continuous-query-example.vcxproj.filters
deleted file mode 100644
index cf3bca9..0000000
--- a/modules/platforms/cpp/examples/continuous-query-example/project/vs/continuous-query-example.vcxproj.filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{35cb32b7-bf2e-440f-9b32-80d392d81847}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{b355095f-b4e2-4324-9516-854828c876ff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{3799efd0-3cfe-47e2-9e9e-a51b25bf40ef}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\continuous_query_example.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\continuous-query-example.xml">
-      <Filter>Config</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/odbc-example/project/vs/odbc-example.vcxproj b/modules/platforms/cpp/examples/odbc-example/project/vs/odbc-example.vcxproj
deleted file mode 100644
index 9f7cf3a..0000000
--- a/modules/platforms/cpp/examples/odbc-example/project/vs/odbc-example.vcxproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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>{56839DFF-6C03-416B-BC5F-DDC6EBF8512D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>igniteexamples</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.jni.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.jni.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\odbc_example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\example-odbc.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/odbc-example/project/vs/odbc-example.vcxproj.filters b/modules/platforms/cpp/examples/odbc-example/project/vs/odbc-example.vcxproj.filters
deleted file mode 100644
index aa4427f..0000000
--- a/modules/platforms/cpp/examples/odbc-example/project/vs/odbc-example.vcxproj.filters
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{6400d7ba-6390-4cdb-aa25-9525f8a71444}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{d054b826-ae5e-4a0c-833f-ae0b975f57d8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\odbc_example.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\example-odbc.xml">
-      <Filter>Config</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/project/vs/ignite-examples.sln b/modules/platforms/cpp/examples/project/vs/ignite-examples.sln
deleted file mode 100644
index 67bf622..0000000
--- a/modules/platforms/cpp/examples/project/vs/ignite-examples.sln
+++ /dev/null
@@ -1,56 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc-example", "..\..\odbc-example\project\vs\odbc-example.vcxproj", "{56839DFF-6C03-416B-BC5F-DDC6EBF8512D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "query-example", "..\..\query-example\project\vs\query-example.vcxproj", "{9FB34AB4-01DD-4C6F-99BF-681019D0E4DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "continuous-query-example", "..\..\continuous-query-example\project\vs\continuous-query-example.vcxproj", "{73BB124A-0CD4-4961-A6CD-61F9C71028A6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "put-get-example", "..\..\put-get-example\project\vs\put-get-example.vcxproj", "{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compute-example", "..\..\compute-example\project\vs\compute-example.vcxproj", "{18BB0A18-8213-472A-81A0-9D9753697135}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thin-client-put-get-example", "..\..\thin-client-put-get-example\project\vs\thin-client-put-get-example.vcxproj", "{8F045A49-A1C8-45B5-B9E4-FFB323AD1060}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cluster-compute-example", "..\..\cluster-compute-example\project\vs\cluster-compute-example.vcxproj", "{72787C8A-9F6F-434B-A01D-59E3BB6069BF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{56839DFF-6C03-416B-BC5F-DDC6EBF8512D}.Release|x64.ActiveCfg = Release|x64
-		{56839DFF-6C03-416B-BC5F-DDC6EBF8512D}.Release|x64.Build.0 = Release|x64
-		{56839DFF-6C03-416B-BC5F-DDC6EBF8512D}.Release|x86.ActiveCfg = Release|Win32
-		{56839DFF-6C03-416B-BC5F-DDC6EBF8512D}.Release|x86.Build.0 = Release|Win32
-		{9FB34AB4-01DD-4C6F-99BF-681019D0E4DD}.Release|x64.ActiveCfg = Release|x64
-		{9FB34AB4-01DD-4C6F-99BF-681019D0E4DD}.Release|x64.Build.0 = Release|x64
-		{9FB34AB4-01DD-4C6F-99BF-681019D0E4DD}.Release|x86.ActiveCfg = Release|Win32
-		{9FB34AB4-01DD-4C6F-99BF-681019D0E4DD}.Release|x86.Build.0 = Release|Win32
-		{73BB124A-0CD4-4961-A6CD-61F9C71028A6}.Release|x64.ActiveCfg = Release|x64
-		{73BB124A-0CD4-4961-A6CD-61F9C71028A6}.Release|x64.Build.0 = Release|x64
-		{73BB124A-0CD4-4961-A6CD-61F9C71028A6}.Release|x86.ActiveCfg = Release|Win32
-		{73BB124A-0CD4-4961-A6CD-61F9C71028A6}.Release|x86.Build.0 = Release|Win32
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.ActiveCfg = Release|x64
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.Build.0 = Release|x64
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.ActiveCfg = Release|Win32
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.Build.0 = Release|Win32
-		{18BB0A18-8213-472A-81A0-9D9753697135}.Release|x64.ActiveCfg = Release|x64
-		{18BB0A18-8213-472A-81A0-9D9753697135}.Release|x64.Build.0 = Release|x64
-		{18BB0A18-8213-472A-81A0-9D9753697135}.Release|x86.ActiveCfg = Release|Win32
-		{18BB0A18-8213-472A-81A0-9D9753697135}.Release|x86.Build.0 = Release|Win32
-		{8F045A49-A1C8-45B5-B9E4-FFB323AD1060}.Release|x64.ActiveCfg = Release|x64
-		{8F045A49-A1C8-45B5-B9E4-FFB323AD1060}.Release|x64.Build.0 = Release|x64
-		{8F045A49-A1C8-45B5-B9E4-FFB323AD1060}.Release|x86.ActiveCfg = Release|Win32
-		{8F045A49-A1C8-45B5-B9E4-FFB323AD1060}.Release|x86.Build.0 = Release|Win32
-		{72787C8A-9F6F-434B-A01D-59E3BB6069BF}.Release|x64.ActiveCfg = Release|x64
-		{72787C8A-9F6F-434B-A01D-59E3BB6069BF}.Release|x64.Build.0 = Release|x64
-		{72787C8A-9F6F-434B-A01D-59E3BB6069BF}.Release|x86.ActiveCfg = Release|Win32
-		{72787C8A-9F6F-434B-A01D-59E3BB6069BF}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/modules/platforms/cpp/examples/put-get-example/project/vs/put-get-example.vcxproj b/modules/platforms/cpp/examples/put-get-example/project/vs/put-get-example.vcxproj
deleted file mode 100644
index cfb160f..0000000
--- a/modules/platforms/cpp/examples/put-get-example/project/vs/put-get-example.vcxproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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>{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>igniteexamples</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.jni.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.jni.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\put_get_example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\example-cache.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/put-get-example/project/vs/put-get-example.vcxproj.filters b/modules/platforms/cpp/examples/put-get-example/project/vs/put-get-example.vcxproj.filters
deleted file mode 100644
index a50a431..0000000
--- a/modules/platforms/cpp/examples/put-get-example/project/vs/put-get-example.vcxproj.filters
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{487c5422-915c-4851-892d-c1599ea69e0c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\example-cache.xml">
-      <Filter>Config</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\put_get_example.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj b/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj
deleted file mode 100644
index 22aa2b9..0000000
--- a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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>{9FB34AB4-01DD-4C6F-99BF-681019D0E4DD}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>igniteexamples</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\..\include;..\..\..\..\jni\os\win\include;..\..\..\..\jni\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\core\os\win\include;..\..\..\..\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.jni.lib;ignite.binary.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\query_example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\query-example.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters b/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters
deleted file mode 100644
index 506b255..0000000
--- a/modules/platforms/cpp/examples/query-example/project/vs/query-example.vcxproj.filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{35cb32b7-bf2e-440f-9b32-80d392d81847}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{b355095f-b4e2-4324-9516-854828c876ff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{89a5a9cc-a2c9-4d11-9044-869c3af6a2fd}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\query_example.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\query-example.xml">
-      <Filter>Config</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/thin-client-put-get-example/project/vs/thin-client-put-get-example.vcxproj b/modules/platforms/cpp/examples/thin-client-put-get-example/project/vs/thin-client-put-get-example.vcxproj
deleted file mode 100644
index 26bc473..0000000
--- a/modules/platforms/cpp/examples/thin-client-put-get-example/project/vs/thin-client-put-get-example.vcxproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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>{8F045A49-A1C8-45B5-B9E4-FFB323AD1060}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>igniteexamples</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\thin-client\os\win\include;..\..\..\..\thin-client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ignite.binary.lib;ignite.thin-client.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.thin-client.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\..\common\os\win\include;..\..\..\..\common\include;..\..\..\..\binary\include;..\..\..\..\thin-client\os\win\include;..\..\..\..\thin-client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ignite.binary.lib;ignite.thin-client.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\project\vs\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\project\vs\$(Platform)\$(Configuration)\ignite.thin-client.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\thin_client_put_get_example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h" />
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/examples/thin-client-put-get-example/project/vs/thin-client-put-get-example.vcxproj.filters b/modules/platforms/cpp/examples/thin-client-put-get-example/project/vs/thin-client-put-get-example.vcxproj.filters
deleted file mode 100644
index 477f7bd..0000000
--- a/modules/platforms/cpp/examples/thin-client-put-get-example/project/vs/thin-client-put-get-example.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\ignite\examples\address.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\organization.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\ignite\examples\person.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\thin_client_put_get_example.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/ignite/project/README.TXT b/modules/platforms/cpp/ignite/project/README.TXT
deleted file mode 100644
index 97f4c64..0000000
--- a/modules/platforms/cpp/ignite/project/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains IDE projects artifacts.
diff --git a/modules/platforms/cpp/ignite/project/vs/README.TXT b/modules/platforms/cpp/ignite/project/vs/README.TXT
deleted file mode 100644
index f4fb456..0000000
--- a/modules/platforms/cpp/ignite/project/vs/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains Visual Studio project artifacts.
\ No newline at end of file
diff --git a/modules/platforms/cpp/ignite/project/vs/ignite.vcxproj b/modules/platforms/cpp/ignite/project/vs/ignite.vcxproj
deleted file mode 100644
index 9a912ef..0000000
--- a/modules/platforms/cpp/ignite/project/vs/ignite.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ignite</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-    <ProjectName>ignite</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;IGNITE_IMPL;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;IGNITE_IMPL;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\ignite.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\core\project\vs\core.vcxproj">
-      <Project>{e2dea693-f2ea-43c2-a813-053378f6e4db}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\jni\project\vs\jni.vcxproj">
-      <Project>{4f7e4917-4612-4b96-9838-025711ade391}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/ignite/project/vs/ignite.vcxproj.filters b/modules/platforms/cpp/ignite/project/vs/ignite.vcxproj.filters
deleted file mode 100644
index 407024b..0000000
--- a/modules/platforms/cpp/ignite/project/vs/ignite.vcxproj.filters
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\ignite.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/jni/CMakeLists.txt b/modules/platforms/cpp/jni/CMakeLists.txt
index 5073195..1caf827 100644
--- a/modules/platforms/cpp/jni/CMakeLists.txt
+++ b/modules/platforms/cpp/jni/CMakeLists.txt
@@ -48,5 +48,9 @@ endif()
 
 target_include_directories(${TARGET} INTERFACE include)
 
-install(TARGETS ${TARGET} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET} 
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h*")
diff --git a/modules/platforms/cpp/jni/project/README.TXT b/modules/platforms/cpp/jni/project/README.TXT
deleted file mode 100644
index 97f4c64..0000000
--- a/modules/platforms/cpp/jni/project/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains IDE projects artifacts.
diff --git a/modules/platforms/cpp/jni/project/vs/README.TXT b/modules/platforms/cpp/jni/project/vs/README.TXT
deleted file mode 100644
index f4fb456..0000000
--- a/modules/platforms/cpp/jni/project/vs/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains Visual Studio project artifacts.
\ No newline at end of file
diff --git a/modules/platforms/cpp/jni/project/vs/jni.vcxproj b/modules/platforms/cpp/jni/project/vs/jni.vcxproj
deleted file mode 100644
index 310ee18..0000000
--- a/modules/platforms/cpp/jni/project/vs/jni.vcxproj
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4F7E4917-4612-4B96-9838-025711ADE391}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>jni</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>ignite.jni</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>ignite.jni</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>ignite.jni</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>ignite.jni</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <StringPooling>true</StringPooling>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>jvm.dll</DelayLoadDLLs>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\jni\exports.h" />
-    <ClInclude Include="..\..\include\ignite\jni\java.h" />
-    <ClInclude Include="..\..\include\ignite\jni\utils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\os\win\src\utils.cpp" />
-    <ClCompile Include="..\..\src\exports.cpp" />
-    <ClCompile Include="..\..\src\java.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ItemGroup>
-    <None Include="module.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/jni/project/vs/jni.vcxproj.filters b/modules/platforms/cpp/jni/project/vs/jni.vcxproj.filters
deleted file mode 100644
index 93fa33d..0000000
--- a/modules/platforms/cpp/jni/project/vs/jni.vcxproj.filters
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Misc">
-      <UniqueIdentifier>{1dbec2be-5cb4-4f70-aef6-b4627d39b99b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\jni\exports.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\jni\java.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\jni\utils.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\exports.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\java.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\utils.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="module.def">
-      <Filter>Misc</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/jni/project/vs/module.def b/modules/platforms/cpp/jni/project/vs/module.def
deleted file mode 100644
index 1407f82..0000000
--- a/modules/platforms/cpp/jni/project/vs/module.def
+++ /dev/null
@@ -1,25 +0,0 @@
-LIBRARY ignite.jni.dll
-EXPORTS
-IgniteReallocate @1 
-IgniteIgnitionStart @2 
-IgniteIgnitionEnvironmentPointer @4 
-IgniteIgnitionStop @5 
-IgniteIgnitionStopAll @6 
-IgniteTargetInStreamOutObject @17 
-IgniteTargetInStreamOutLong @18 
-IgniteTargetOutStream @19 
-IgniteTargetInStreamOutStream @20 
-IgniteTargetInObjectStreamOutObjectStream @21
-IgniteTargetInLongOutLong @24
-IgniteTargetInStreamAsync @25
-IgniteTargetInStreamOutObjectAsync @26
-IgniteAcquire @80
-IgniteRelease @81
-IgniteThrowToJava @82 
-IgniteHandlersSize @83 
-IgniteCreateContext @84 
-IgniteDeleteContext @85 
-IgniteDestroyJvm @86 
-IgniteTargetOutObject @91 
-IgniteSetConsoleHandler @135
-IgniteRemoveConsoleHandler @136
\ No newline at end of file
diff --git a/modules/platforms/cpp/network/CMakeLists.txt b/modules/platforms/cpp/network/CMakeLists.txt
index 6665ab7..3c3279c 100644
--- a/modules/platforms/cpp/network/CMakeLists.txt
+++ b/modules/platforms/cpp/network/CMakeLists.txt
@@ -73,5 +73,9 @@ foreach(_target_lib IN LISTS _target_libs)
 endforeach()
 unset(_target_libs)
 
-install(TARGETS ${TARGET} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET} 
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h*")
diff --git a/modules/platforms/cpp/network/project/vs/network.vcxproj b/modules/platforms/cpp/network/project/vs/network.vcxproj
deleted file mode 100644
index 18a8e8a..0000000
--- a/modules/platforms/cpp/network/project/vs/network.vcxproj
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CB77AC4D-88D4-4A8C-922C-A28C19060A97}</ProjectGuid>
-    <RootNamespace>network</RootNamespace>
-    <ProjectName>network</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>ignite.network</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>ignite.network</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>ignite.network</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>ignite.network</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\os\win\src;$(OPENSSL_HOME)\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\os\win\src;$(OPENSSL_HOME_X86)\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\os\win\src;$(OPENSSL_HOME)\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\os\win\src;$(OPENSSL_HOME_X86)\include</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\network\end_point.h" />
-    <ClInclude Include="..\..\include\ignite\network\network.h" />
-    <ClInclude Include="..\..\include\ignite\network\utils.h" />
-    <ClInclude Include="..\..\include\ignite\network\socket_client.h" />
-    <ClInclude Include="..\..\include\ignite\network\tcp_range.h" />
-    <ClInclude Include="..\..\os\win\src\network\sockets.h" />
-    <ClInclude Include="..\..\src\network\ssl\secure_socket_client.h" />
-    <ClInclude Include="..\..\src\network\ssl\ssl_gateway.h" />
-    <ClInclude Include="..\..\src\network\tcp_socket_client.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\os\win\src\network\sockets.cpp" />
-    <ClCompile Include="..\..\os\win\src\network\tcp_socket_client.cpp" />
-    <ClCompile Include="..\..\os\win\src\network\utils.cpp" />
-    <ClCompile Include="..\..\src\network\network.cpp" />
-    <ClCompile Include="..\..\src\network\ssl\secure_socket_client.cpp" />
-    <ClCompile Include="..\..\src\network\ssl\ssl_gateway.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/network/project/vs/network.vcxproj.filters b/modules/platforms/cpp/network/project/vs/network.vcxproj.filters
deleted file mode 100644
index 707b6db..0000000
--- a/modules/platforms/cpp/network/project/vs/network.vcxproj.filters
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{89eb3c72-85c7-4c46-ba6d-a668ab852e02}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\network">
-      <UniqueIdentifier>{383a382d-5683-417b-87f5-702df88a791a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\network\ssl">
-      <UniqueIdentifier>{1bb8ce28-5b9b-4735-88b3-9d979de21d10}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\network\end_point.h">
-      <Filter>Code\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\network\socket_client.h">
-      <Filter>Code\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\network\tcp_range.h">
-      <Filter>Code\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\network\utils.h">
-      <Filter>Code\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\network\ssl\secure_socket_client.h">
-      <Filter>Code\network\ssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\network\ssl\ssl_gateway.h">
-      <Filter>Code\network\ssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\network\tcp_socket_client.h">
-      <Filter>Code\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\network\network.h">
-      <Filter>Code\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\os\win\src\network\sockets.h">
-      <Filter>Code\network</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\network\ssl\secure_socket_client.cpp">
-      <Filter>Code\network\ssl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\network\ssl\ssl_gateway.cpp">
-      <Filter>Code\network\ssl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\network\network.cpp">
-      <Filter>Code\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\network\tcp_socket_client.cpp">
-      <Filter>Code\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\network\utils.cpp">
-      <Filter>Code\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\network\sockets.cpp">
-      <Filter>Code\network</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj
deleted file mode 100644
index cfc5ac1..0000000
--- a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{309BEA40-495D-463F-98D5-4657F03F6D8F}</ProjectGuid>
-    <RootNamespace>odbctest</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\odbc\include;$(Projec [...]
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;IGNITE_IMPL;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;$(BOOST_LIB32_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_system-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_D32).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\odbc\include;$(Projec [...]
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;IGNITE_IMPL;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;$(BOOST_LIB64_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_system-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_D64).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\odbc\include;$(Projec [...]
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;IGNITE_IMPL;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;$(BOOST_LIB32_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_system-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_R32).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\odbc\include;$(Projec [...]
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;IGNITE_IMPL;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(JAVA_HOME)\lib\jvm.lib;$(BOOST_LIB64_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_system-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_R64).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\odbc\src\app\application_data_buffer.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\column.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\common_types.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\config\configuration.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\config\config_tools.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\config\connection_info.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\config\connection_string_parser.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\cursor.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\diagnostic\diagnostic_record.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\diagnostic\diagnostic_record_storage.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\log.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\nested_tx_mode.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\protocol_version.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\result_page.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\row.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_lexer.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_parser.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_set_streaming_command.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_utils.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\ssl_mode.cpp" />
-    <ClCompile Include="..\..\..\odbc\src\utility.cpp" />
-    <ClCompile Include="..\..\src\api_robustness_test.cpp" />
-    <ClCompile Include="..\..\src\application_data_buffer_test.cpp" />
-    <ClCompile Include="..\..\src\attributes_test.cpp" />
-    <ClCompile Include="..\..\src\authentication_test.cpp" />
-    <ClCompile Include="..\..\src\column_test.cpp" />
-    <ClCompile Include="..\..\src\configuration_test.cpp" />
-    <ClCompile Include="..\..\src\connection_info_test.cpp" />
-    <ClCompile Include="..\..\src\connection_test.cpp" />
-    <ClCompile Include="..\..\src\cursor_binding_test.cpp" />
-    <ClCompile Include="..\..\src\cursor_test.cpp" />
-    <ClCompile Include="..\..\src\errors_test.cpp" />
-    <ClCompile Include="..\..\src\meta_queries_test.cpp" />
-    <ClCompile Include="..\..\src\odbc_test_suite.cpp" />
-    <ClCompile Include="..\..\src\queries_ssl_test.cpp" />
-    <ClCompile Include="..\..\src\queries_test.cpp" />
-    <ClCompile Include="..\..\src\parser_test.cpp" />
-    <ClCompile Include="..\..\src\row_test.cpp" />
-    <ClCompile Include="..\..\src\sql_aggregate_functions_test.cpp" />
-    <ClCompile Include="..\..\src\sql_get_info_test.cpp" />
-    <ClCompile Include="..\..\src\sql_outer_join_test.cpp" />
-    <ClCompile Include="..\..\src\sql_date_time_functions_test.cpp" />
-    <ClCompile Include="..\..\src\sql_parsing_test.cpp" />
-    <ClCompile Include="..\..\src\sql_test_suite_fixture.cpp" />
-    <ClCompile Include="..\..\src\sql_numeric_functions_test.cpp" />
-    <ClCompile Include="..\..\src\sql_operators_test.cpp" />
-    <ClCompile Include="..\..\src\sql_string_functions_test.cpp" />
-    <ClCompile Include="..\..\src\sql_system_functions_test.cpp" />
-    <ClCompile Include="..\..\src\sql_esc_convert_function_test.cpp" />
-    <ClCompile Include="..\..\src\sql_types_test.cpp" />
-    <ClCompile Include="..\..\src\sql_value_expressions_test.cpp" />
-    <ClCompile Include="..\..\src\streaming_test.cpp" />
-    <ClCompile Include="..\..\src\teamcity\teamcity_boost.cpp" />
-    <ClCompile Include="..\..\src\teamcity\teamcity_messages.cpp" />
-    <ClCompile Include="..\..\src\test_server.cpp" />
-    <ClCompile Include="..\..\src\test_utils.cpp" />
-    <ClCompile Include="..\..\src\transaction_test.cpp" />
-    <ClCompile Include="..\..\src\types_test.cpp" />
-    <ClCompile Include="..\..\src\utility_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\complex_type.h" />
-    <ClInclude Include="..\..\include\odbc_test_suite.h" />
-    <ClInclude Include="..\..\include\sql_test_suite_fixture.h" />
-    <ClInclude Include="..\..\include\teamcity\teamcity_messages.h" />
-    <ClInclude Include="..\..\include\test_server.h" />
-    <ClInclude Include="..\..\include\test_type.h" />
-    <ClInclude Include="..\..\include\test_utils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\binary\project\vs\binary.vcxproj">
-      <Project>{4f15669b-92eb-49f0-b774-8f19bae0b960}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\project\vs\core.vcxproj">
-      <Project>{e2dea693-f2ea-43c2-a813-053378f6e4db}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\jni\project\vs\jni.vcxproj">
-      <Project>{4f7e4917-4612-4b96-9838-025711ade391}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\queries-auth-32.xml" />
-    <None Include="..\..\config\queries-auth.xml" />
-    <None Include="..\..\config\queries-default.xml" />
-    <None Include="..\..\config\queries-ssl-32.xml" />
-    <None Include="..\..\config\queries-ssl.xml" />
-    <None Include="..\..\config\queries-test-32.xml" />
-    <None Include="..\..\config\queries-test.xml" />
-    <None Include="..\..\config\queries-transaction-32.xml" />
-    <None Include="..\..\config\queries-transaction.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters
deleted file mode 100644
index 5d6e787..0000000
--- a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Externals">
-      <UniqueIdentifier>{cc75fc86-c08d-428a-8ae3-f9979e4588ab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\CacheTypes">
-      <UniqueIdentifier>{43a56b9a-0f5c-4c22-8836-1102252497a4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\TeamCity">
-      <UniqueIdentifier>{5438a56d-1009-412a-86e3-ceb1112af275}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Configs">
-      <UniqueIdentifier>{fe8a65d3-4f84-4051-ac62-cf4e0f788b43}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\configuration_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\connection_info_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\connection_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\parser_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\application_data_buffer_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\row_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cursor_binding_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cursor_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utility_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\column_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\app\application_data_buffer.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\column.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\config\configuration.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\config\connection_info.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\cursor.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\result_page.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\row.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\utility.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\teamcity\teamcity_boost.cpp">
-      <Filter>Code\TeamCity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\teamcity\teamcity_messages.cpp">
-      <Filter>Code\TeamCity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\queries_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\protocol_version.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_string_functions_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\test_utils.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_numeric_functions_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_aggregate_functions_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_system_functions_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_esc_convert_function_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_operators_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_types_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_test_suite_fixture.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_value_expressions_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_outer_join_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_date_time_functions_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\api_robustness_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\log.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\meta_queries_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\attributes_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\errors_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_get_info_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\types_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odbc_test_suite.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\queries_ssl_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\transaction_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\config\connection_string_parser.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\config\config_tools.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\diagnostic\diagnostic_record_storage.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\diagnostic\diagnostic_record.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\common_types.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\authentication_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\nested_tx_mode.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_parsing_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_lexer.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_parser.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_set_streaming_command.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\sql\sql_utils.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\streaming_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\odbc\src\ssl_mode.cpp">
-      <Filter>Externals</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\test_server.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\test_type.h">
-      <Filter>Code\CacheTypes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\teamcity\teamcity_messages.h">
-      <Filter>Code\TeamCity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\test_utils.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\sql_test_suite_fixture.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\complex_type.h">
-      <Filter>Code\CacheTypes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\odbc_test_suite.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\test_server.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\config\queries-test-32.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-test.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-default.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-ssl.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-ssl-32.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-auth.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-auth-32.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-transaction.xml">
-      <Filter>Configs</Filter>
-    </None>
-    <None Include="..\..\config\queries-transaction-32.xml">
-      <Filter>Configs</Filter>
-    </None>
-  </ItemGroup>
-</Project>
diff --git a/modules/platforms/cpp/odbc/CMakeLists.txt b/modules/platforms/cpp/odbc/CMakeLists.txt
index 0244cf5..c9cc1fa 100644
--- a/modules/platforms/cpp/odbc/CMakeLists.txt
+++ b/modules/platforms/cpp/odbc/CMakeLists.txt
@@ -77,7 +77,7 @@ if (WIN32)
             os/win/src/system/ui/custom_window.cpp
             os/win/src/system/ui/dsn_configuration_window.cpp
             os/win/src/system/ui/window.cpp
-            project/vs/module.def)
+            module.def)
 endif ()
 
 add_library(${TARGET} SHARED ${SOURCES})
@@ -156,7 +156,11 @@ endif()
 
 target_include_directories(${TARGET} INTERFACE include)
 
-install(TARGETS ${TARGET} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET} 
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+)
 
 if (WIN32 AND ${WITH_ODBC_MSI})
    install(FILES ${WIX_INSTALLER_PREFIX}.msi DESTINATION bin)
diff --git a/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs b/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs
deleted file mode 100644
index 78a7c01..0000000
--- a/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.0' encoding='windows-1252'?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-	<Product Name='Apache Ignite ODBC 64-bit Driver' Manufacturer='The Apache Software Foundation'
-		Id='F3E308E4-910C-4AF5-82DE-2ACF4D64830E' 
-		UpgradeCode='1D7AEFDF-6CD2-4FB5-88F2-811A89832D6D'
-		Language='1033' Codepage='1252' Version='2.13.0.58917'>
-		
-		<Package Id='*' Keywords='Installer' Description="Apache Ignite ODBC 64-bit Driver Installer"
-			Comments='Apache, Apache Ignite, the Apache feather and the Apache Ignite logo are trademarks of The Apache Software Foundation.'
-			Platform="x64" InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-
-		<Media Id='1' Cabinet='package.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-		<Property Id='DiskPrompt' Value="Apache Ignite ODBC 64-bit Driver Installation [1]" />
-		
-		<Directory Id='TARGETDIR' Name='SourceDir'>
-			<Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
-				<Directory Id='ApacheIgnite' Name='Apache Ignite'>
-					<Directory Id='INSTALLDIR' Name='ODBC Driver'>
-						<Component Id='Driver' Guid='E5F0DDF2-DD3C-4196-8A08-70921858A52F' Win64='yes'>
-							<File Id='IgniteOdbcDll' Name='ignite.odbc.dll' DiskId='1' Source='../../project/vs/x64/Release/ignite.odbc.dll' KeyPath='yes'/>
-							
-							<RegistryValue Root='HKLM' Key='Software\ODBC\ODBCINST.INI\ODBC Drivers' Name='Apache Ignite' Type='string' Value='Installed'/>
-							
-							<RegistryKey Id='OdbcDriverRegInfo' Root='HKLM' Key='Software\ODBC\ODBCINST.INI\Apache Ignite' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
-								<RegistryValue Type='string' Name='DriverODBCVer' Value='03.00'/>
-								<RegistryValue Type='string' Name='Driver' Value='[#IgniteOdbcDll]'/>
-								<RegistryValue Type='string' Name='Setup' Value='[#IgniteOdbcDll]'/>
-								<RegistryValue Type='integer' Name='UsageCount' Value='1'/>
-							</RegistryKey>
-							
-						</Component>
-					</Directory>
-				</Directory>
-			</Directory>
-		</Directory>
-		
-		<Feature Id='Complete' Title='ODBC Driver' Description='Apache Ignite ODBC Driver.' Level='1'
-			ConfigurableDirectory='INSTALLDIR' Absent='disallow' AllowAdvertise='no' InstallDefault='local'>
-			<ComponentRef Id='Driver' />
-		</Feature>
-		
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-		
-		<UI Id="WixUI_InstallDir">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-            
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
-        </UI>
-
-        <UIRef Id="WixUI_Common" />
-		<UIRef Id="WixUI_ErrorProgressText" />
-		
-	</Product>
-</Wix>
\ No newline at end of file
diff --git a/modules/platforms/cpp/odbc/install/ignite-odbc-x86.wxs b/modules/platforms/cpp/odbc/install/ignite-odbc-x86.wxs
deleted file mode 100644
index e75043a..0000000
--- a/modules/platforms/cpp/odbc/install/ignite-odbc-x86.wxs
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.0' encoding='windows-1252'?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-	<Product Name='Apache Ignite ODBC 32-bit Driver' Manufacturer='The Apache Software Foundation'
-		Id='D39CBABA-1E21-4701-AA5C-91EDA07B383B' 
-		UpgradeCode='743902A4-365C-424E-B226-5B2898A3941E'
-		Language='1033' Codepage='1252' Version='2.13.0.58917'>
-		
-		<Package Id='*' Keywords='Installer' Description="Apache Ignite ODBC 32-bit Driver Installer"
-			Comments='Apache, Apache Ignite, the Apache feather and the Apache Ignite logo are trademarks of The Apache Software Foundation.'
-			InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-
-		<Media Id='1' Cabinet='package.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-		<Property Id='DiskPrompt' Value="Apache Ignite ODBC 32-bit Driver Installation [1]" />
-		
-		<Directory Id='TARGETDIR' Name='SourceDir'>
-			<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
-				<Directory Id='ApacheIgnite' Name='Apache Ignite'>
-					<Directory Id='INSTALLDIR' Name='ODBC Driver'>
-						<Component Id='Driver' Guid='4AFA26EE-C639-4EF2-A9B2-281119BB4BB5'>
-							<File Id='IgniteOdbcDll' Name='ignite.odbc.dll' DiskId='1' Source='../../project/vs/Win32/Release/ignite.odbc.dll' KeyPath='yes'/>
-							
-							<RegistryValue Root='HKLM' Key='Software\ODBC\ODBCINST.INI\ODBC Drivers' Name='Apache Ignite' Type='string' Value='Installed'/>
-							
-							<RegistryKey Id='OdbcDriverRegInfo' Root='HKLM' Key='Software\ODBC\ODBCINST.INI\Apache Ignite' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
-								<RegistryValue Type='string' Name='DriverODBCVer' Value='03.00'/>
-								<RegistryValue Type='string' Name='Driver' Value='[#IgniteOdbcDll]'/>
-								<RegistryValue Type='string' Name='Setup' Value='[#IgniteOdbcDll]'/>
-								<RegistryValue Type='integer' Name='UsageCount' Value='1'/>
-							</RegistryKey>
-							
-						</Component>
-					</Directory>
-				</Directory>
-			</Directory>
-		</Directory>
-		
-		<Feature Id='Complete' Title='ODBC Driver' Description='Apache Ignite ODBC Driver.' Level='1'
-			ConfigurableDirectory='INSTALLDIR' Absent='disallow' AllowAdvertise='no' InstallDefault='local'>
-			<ComponentRef Id='Driver' />
-		</Feature>
-		
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-		
-		<UI Id="WixUI_InstallDir">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-            
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
-        </UI>
-
-        <UIRef Id="WixUI_Common" />
-		<UIRef Id="WixUI_ErrorProgressText" />
-		
-	</Product>
-</Wix>
\ No newline at end of file
diff --git a/modules/platforms/cpp/odbc/project/vs/module.def b/modules/platforms/cpp/odbc/module.def
similarity index 100%
rename from modules/platforms/cpp/odbc/project/vs/module.def
rename to modules/platforms/cpp/odbc/module.def
diff --git a/modules/platforms/cpp/odbc/project/README.TXT b/modules/platforms/cpp/odbc/project/README.TXT
deleted file mode 100644
index 97f4c64..0000000
--- a/modules/platforms/cpp/odbc/project/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains IDE projects artifacts.
diff --git a/modules/platforms/cpp/odbc/project/vs/README.TXT b/modules/platforms/cpp/odbc/project/vs/README.TXT
deleted file mode 100644
index f4fb456..0000000
--- a/modules/platforms/cpp/odbc/project/vs/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Contains Visual Studio project artifacts.
\ No newline at end of file
diff --git a/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj b/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj
deleted file mode 100644
index b4db4c5..0000000
--- a/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{12F77E12-38FE-42D3-B1DA-7E5979362961}</ProjectGuid>
-    <RootNamespace>ignite.odbc</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.odbc</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.odbc</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.odbc</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.odbc</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME_X86)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>
-      </DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>
-      </DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME_X86)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\os\win\src\system_dsn.cpp" />
-    <ClCompile Include="..\..\os\win\src\system\ui\custom_window.cpp" />
-    <ClCompile Include="..\..\os\win\src\system\ui\dsn_configuration_window.cpp" />
-    <ClCompile Include="..\..\os\win\src\system\ui\window.cpp" />
-    <ClCompile Include="..\..\src\app\application_data_buffer.cpp" />
-    <ClCompile Include="..\..\src\app\parameter.cpp" />
-    <ClCompile Include="..\..\src\app\parameter_set.cpp" />
-    <ClCompile Include="..\..\src\column.cpp" />
-    <ClCompile Include="..\..\src\common_types.cpp" />
-    <ClCompile Include="..\..\src\config\configuration.cpp" />
-    <ClCompile Include="..\..\src\config\config_tools.cpp" />
-    <ClCompile Include="..\..\src\config\connection_string_parser.cpp" />
-    <ClCompile Include="..\..\src\config\connection_info.cpp" />
-    <ClCompile Include="..\..\src\connection.cpp" />
-    <ClCompile Include="..\..\src\cursor.cpp" />
-    <ClCompile Include="..\..\src\diagnostic\diagnosable_adapter.cpp" />
-    <ClCompile Include="..\..\src\diagnostic\diagnostic_record.cpp" />
-    <ClCompile Include="..\..\src\diagnostic\diagnostic_record_storage.cpp" />
-    <ClCompile Include="..\..\src\dsn_config.cpp" />
-    <ClCompile Include="..\..\src\entry_points.cpp" />
-    <ClCompile Include="..\..\src\environment.cpp" />
-    <ClCompile Include="..\..\src\message.cpp" />
-    <ClCompile Include="..\..\src\meta\column_meta.cpp" />
-    <ClCompile Include="..\..\src\meta\table_meta.cpp" />
-    <ClCompile Include="..\..\src\nested_tx_mode.cpp" />
-    <ClCompile Include="..\..\src\odbc.cpp" />
-    <ClCompile Include="..\..\src\protocol_version.cpp" />
-    <ClCompile Include="..\..\src\query\batch_query.cpp" />
-    <ClCompile Include="..\..\src\query\data_query.cpp" />
-    <ClCompile Include="..\..\src\query\column_metadata_query.cpp" />
-    <ClCompile Include="..\..\src\query\foreign_keys_query.cpp" />
-    <ClCompile Include="..\..\src\query\primary_keys_query.cpp" />
-    <ClCompile Include="..\..\src\query\special_columns_query.cpp" />
-    <ClCompile Include="..\..\src\query\streaming_query.cpp" />
-    <ClCompile Include="..\..\src\query\table_metadata_query.cpp" />
-    <ClCompile Include="..\..\src\query\type_info_query.cpp" />
-    <ClCompile Include="..\..\src\result_page.cpp" />
-    <ClCompile Include="..\..\src\row.cpp" />
-    <ClCompile Include="..\..\src\sql\sql_lexer.cpp" />
-    <ClCompile Include="..\..\src\sql\sql_parser.cpp" />
-    <ClCompile Include="..\..\src\sql\sql_set_streaming_command.cpp" />
-    <ClCompile Include="..\..\src\sql\sql_utils.cpp" />
-    <ClCompile Include="..\..\src\ssl_mode.cpp" />
-    <ClCompile Include="..\..\src\statement.cpp" />
-    <ClCompile Include="..\..\src\streaming\streaming_batch.cpp" />
-    <ClCompile Include="..\..\src\streaming\streaming_context.cpp" />
-    <ClCompile Include="..\..\src\type_traits.cpp" />
-    <ClCompile Include="..\..\src\utility.cpp" />
-    <ClCompile Include="..\..\src\log.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="module.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\odbc.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\app\application_data_buffer.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\app\parameter.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\app\parameter_set.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\column.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\common_types.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\config\configuration.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\config\connection_string_parser.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\config\connection_info.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\config\config_tools.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\config\settable_value.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\connection.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\cursor.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnosable.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnosable_adapter.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnostic_record.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnostic_record_storage.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\dsn_config.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\end_point.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\environment.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\message.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\meta\column_meta.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\meta\primary_key_meta.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\meta\table_meta.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\nested_tx_mode.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\odbc_error.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\parser.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\protocol_version.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\batch_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\data_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\column_metadata_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\foreign_keys_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\internal_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\primary_keys_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\special_columns_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\streaming_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\table_metadata_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\query\type_info_query.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\result_page.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\row.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_command.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_lexer.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_parser.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_set_streaming_command.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_token.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_utils.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\ssl_mode.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\statement.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\streaming\streaming_batch.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\streaming\streaming_context.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\system\odbc_constants.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\system\ui\dsn_configuration_window.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\type_traits.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\utility.h" />
-    <ClInclude Include="..\..\include\ignite\odbc\log.h" />
-    <ClInclude Include="..\..\os\win\include\ignite\odbc\system\ui\custom_window.h" />
-    <ClInclude Include="..\..\os\win\include\ignite\odbc\system\ui\window.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\binary\project\vs\binary.vcxproj">
-      <Project>{4f15669b-92eb-49f0-b774-8f19bae0b960}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\network\project\vs\network.vcxproj">
-      <Project>{cb77ac4d-88d4-4a8c-922c-a28c19060a97}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj.filters b/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj.filters
deleted file mode 100644
index 0c5d97c..0000000
--- a/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj.filters
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Misc">
-      <UniqueIdentifier>{3f714d15-6347-46a7-bc59-d87c1aea900c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\query">
-      <UniqueIdentifier>{b09a6b2e-c30c-4727-8e85-4b315e757706}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\meta">
-      <UniqueIdentifier>{71d6243f-e8c9-4f21-a5a3-3dc89641af28}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\config">
-      <UniqueIdentifier>{71117941-fa47-4768-afe8-901c94d431c7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\app">
-      <UniqueIdentifier>{dbe40149-df23-4b89-92e4-16817775cd0e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\system">
-      <UniqueIdentifier>{7ab279dc-6586-4b32-aca7-0add0c0ab68a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\diagnostic">
-      <UniqueIdentifier>{df33e506-b5d8-423f-bcc5-1825242a3e28}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\system\ui">
-      <UniqueIdentifier>{ff144e89-0a10-42c3-97dd-d22bfdbc7abb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\sql">
-      <UniqueIdentifier>{7f412a6b-279a-4a22-b87f-eafb1545a8d0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\streaming">
-      <UniqueIdentifier>{a14eb935-4a95-4202-a83b-12e715cf1cf1}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\odbc.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\connection.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\environment.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\statement.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\type_traits.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common_types.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utility.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\log.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cursor.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\result_page.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\row.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\data_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\column_metadata_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\table_metadata_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\meta\column_meta.cpp">
-      <Filter>Code\meta</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\meta\table_meta.cpp">
-      <Filter>Code\meta</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\config\configuration.cpp">
-      <Filter>Code\config</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\config\connection_info.cpp">
-      <Filter>Code\config</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\app\application_data_buffer.cpp">
-      <Filter>Code\app</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\app\parameter.cpp">
-      <Filter>Code\app</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\foreign_keys_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\primary_keys_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\diagnostic\diagnostic_record.cpp">
-      <Filter>Code\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\diagnostic\diagnostic_record_storage.cpp">
-      <Filter>Code\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\diagnostic\diagnosable_adapter.cpp">
-      <Filter>Code\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\type_info_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\column.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\special_columns_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\entry_points.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\system\ui\window.cpp">
-      <Filter>Code\system\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\system\ui\custom_window.cpp">
-      <Filter>Code\system\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\system\ui\dsn_configuration_window.cpp">
-      <Filter>Code\system\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\os\win\src\system_dsn.cpp">
-      <Filter>Code\system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\dsn_config.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\protocol_version.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\app\parameter_set.cpp">
-      <Filter>Code\app</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\batch_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\message.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\config\connection_string_parser.cpp">
-      <Filter>Code\config</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\config\config_tools.cpp">
-      <Filter>Code\config</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\nested_tx_mode.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql\sql_lexer.cpp">
-      <Filter>Code\sql</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql\sql_parser.cpp">
-      <Filter>Code\sql</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql\sql_set_streaming_command.cpp">
-      <Filter>Code\sql</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql\sql_utils.cpp">
-      <Filter>Code\sql</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\streaming\streaming_batch.cpp">
-      <Filter>Code\streaming</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\query\streaming_query.cpp">
-      <Filter>Code\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\streaming\streaming_context.cpp">
-      <Filter>Code\streaming</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ssl_mode.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="module.def">
-      <Filter>Misc</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\odbc\common_types.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\connection.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\cursor.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\environment.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\message.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\parser.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\result_page.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\row.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\statement.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\type_traits.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\utility.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\log.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\data_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\column_metadata_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\table_metadata_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\meta\column_meta.h">
-      <Filter>Code\meta</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\meta\table_meta.h">
-      <Filter>Code\meta</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\config\configuration.h">
-      <Filter>Code\config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\config\connection_info.h">
-      <Filter>Code\config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\app\application_data_buffer.h">
-      <Filter>Code\app</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\app\parameter.h">
-      <Filter>Code\app</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\foreign_keys_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\primary_keys_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\meta\primary_key_meta.h">
-      <Filter>Code\meta</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnostic_record.h">
-      <Filter>Code\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnostic_record_storage.h">
-      <Filter>Code\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnosable.h">
-      <Filter>Code\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\diagnostic\diagnosable_adapter.h">
-      <Filter>Code\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\system\odbc_constants.h">
-      <Filter>Code\system</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\type_info_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\column.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\special_columns_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\os\win\include\ignite\odbc\system\ui\window.h">
-      <Filter>Code\system\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\os\win\include\ignite\odbc\system\ui\custom_window.h">
-      <Filter>Code\system\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\system\ui\dsn_configuration_window.h">
-      <Filter>Code\system\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\dsn_config.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\protocol_version.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\app\parameter_set.h">
-      <Filter>Code\app</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\batch_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\odbc_error.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\config\connection_string_parser.h">
-      <Filter>Code\config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\config\settable_value.h">
-      <Filter>Code\config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\config\config_tools.h">
-      <Filter>Code\config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\end_point.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\nested_tx_mode.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_lexer.h">
-      <Filter>Code\sql</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_parser.h">
-      <Filter>Code\sql</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_token.h">
-      <Filter>Code\sql</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_set_streaming_command.h">
-      <Filter>Code\sql</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_command.h">
-      <Filter>Code\sql</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\sql\sql_utils.h">
-      <Filter>Code\sql</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\internal_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\streaming\streaming_batch.h">
-      <Filter>Code\streaming</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\query\streaming_query.h">
-      <Filter>Code\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\streaming\streaming_context.h">
-      <Filter>Code\streaming</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\odbc\ssl_mode.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/project/vs/ignite.sln b/modules/platforms/cpp/project/vs/ignite.sln
deleted file mode 100644
index 3be196e9..0000000
--- a/modules/platforms/cpp/project/vs/ignite.sln
+++ /dev/null
@@ -1,138 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\core\project\vs\core.vcxproj", "{E2DEA693-F2EA-43C2-A813-053378F6E4DB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960} = {4F15669B-92EB-49F0-B774-8F19BAE0B960}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core-test", "..\..\core-test\project\vs\core-test.vcxproj", "{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960} = {4F15669B-92EB-49F0-B774-8F19BAE0B960}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ignite", "..\..\ignite\project\vs\ignite.vcxproj", "{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960} = {4F15669B-92EB-49F0-B774-8F19BAE0B960}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binary", "..\..\binary\project\vs\binary.vcxproj", "{4F15669B-92EB-49F0-B774-8F19BAE0B960}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "..\..\odbc\project\vs\odbc.vcxproj", "{12F77E12-38FE-42D3-B1DA-7E5979362961}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc-test", "..\..\odbc-test\project\vs\odbc-test.vcxproj", "{309BEA40-495D-463F-98D5-4657F03F6D8F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\common\project\vs\common.vcxproj", "{B63F2E01-5157-4719-8491-0E1C7CD3B701}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "..\..\jni\project\vs\jni.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thin-client", "..\..\thin-client\project\vs\thin-client.vcxproj", "{5C037386-B5F5-4A58-9EE2-3D3A508AA866}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thin-client-test", "..\..\thin-client-test\project\vs\thin-client-test.vcxproj", "{5662F10A-9C40-45D6-AFF8-E93573FEAABA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "..\..\network\project\vs\network.vcxproj", "{CB77AC4D-88D4-4A8C-922C-A28C19060A97}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.ActiveCfg = Debug|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.Build.0 = Debug|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.Build.0 = Release|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.ActiveCfg = Release|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.Build.0 = Release|x64
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Debug|Win32.Build.0 = Debug|Win32
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Debug|x64.ActiveCfg = Debug|x64
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Debug|x64.Build.0 = Debug|x64
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Release|Win32.ActiveCfg = Release|Win32
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Release|Win32.Build.0 = Release|Win32
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Release|x64.ActiveCfg = Release|x64
-		{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Release|x64.Build.0 = Release|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|Win32.ActiveCfg = Debug|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|Win32.Build.0 = Debug|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|x64.ActiveCfg = Debug|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|x64.Build.0 = Debug|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|Win32.ActiveCfg = Release|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|Win32.Build.0 = Release|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|x64.ActiveCfg = Release|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|x64.Build.0 = Release|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|Win32.Build.0 = Debug|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|x64.ActiveCfg = Debug|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|x64.Build.0 = Debug|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|Win32.ActiveCfg = Release|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|Win32.Build.0 = Release|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|x64.ActiveCfg = Release|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|x64.Build.0 = Release|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|Win32.Build.0 = Debug|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|x64.ActiveCfg = Debug|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|x64.Build.0 = Debug|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|Win32.ActiveCfg = Release|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|Win32.Build.0 = Release|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|x64.ActiveCfg = Release|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|x64.Build.0 = Release|x64
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Debug|Win32.Build.0 = Debug|Win32
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Debug|x64.ActiveCfg = Debug|x64
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Debug|x64.Build.0 = Debug|x64
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Release|Win32.ActiveCfg = Release|Win32
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Release|Win32.Build.0 = Release|Win32
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Release|x64.ActiveCfg = Release|x64
-		{309BEA40-495D-463F-98D5-4657F03F6D8F}.Release|x64.Build.0 = Release|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Win32.Build.0 = Debug|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.ActiveCfg = Debug|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.Build.0 = Debug|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Win32.ActiveCfg = Release|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Win32.Build.0 = Release|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.ActiveCfg = Release|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.Build.0 = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.Build.0 = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Win32.ActiveCfg = Release|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Win32.Build.0 = Release|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = Release|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|Win32.Build.0 = Debug|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|x64.ActiveCfg = Debug|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|x64.Build.0 = Debug|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|Win32.ActiveCfg = Release|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|Win32.Build.0 = Release|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|x64.ActiveCfg = Release|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|x64.Build.0 = Release|x64
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Debug|Win32.Build.0 = Debug|Win32
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Debug|x64.ActiveCfg = Debug|x64
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Debug|x64.Build.0 = Debug|x64
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Release|Win32.ActiveCfg = Release|Win32
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Release|Win32.Build.0 = Release|Win32
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Release|x64.ActiveCfg = Release|x64
-		{5662F10A-9C40-45D6-AFF8-E93573FEAABA}.Release|x64.Build.0 = Release|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|Win32.Build.0 = Debug|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|x64.ActiveCfg = Debug|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|x64.Build.0 = Debug|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|Win32.ActiveCfg = Release|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|Win32.Build.0 = Release|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|x64.ActiveCfg = Release|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3761BFB8-4345-4AC4-BE04-5ACB1DCA842C}
-	EndGlobalSection
-EndGlobal
diff --git a/modules/platforms/cpp/project/vs/ignite.slnrel b/modules/platforms/cpp/project/vs/ignite.slnrel
deleted file mode 100644
index 9fe1fbb..0000000
--- a/modules/platforms/cpp/project/vs/ignite.slnrel
+++ /dev/null
@@ -1,98 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\core\project\vs\core.vcxproj", "{E2DEA693-F2EA-43C2-A813-053378F6E4DB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960} = {4F15669B-92EB-49F0-B774-8F19BAE0B960}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ignite", "..\..\ignite\project\vs\ignite.vcxproj", "{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960} = {4F15669B-92EB-49F0-B774-8F19BAE0B960}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binary", "..\..\binary\project\vs\binary.vcxproj", "{4F15669B-92EB-49F0-B774-8F19BAE0B960}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "..\..\odbc\project\vs\odbc.vcxproj", "{12F77E12-38FE-42D3-B1DA-7E5979362961}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\common\project\vs\common.vcxproj", "{B63F2E01-5157-4719-8491-0E1C7CD3B701}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "..\..\jni\project\vs\jni.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thin-client", "..\..\thin-client\project\vs\thin-client.vcxproj", "{5C037386-B5F5-4A58-9EE2-3D3A508AA866}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "..\..\network\project\vs\network.vcxproj", "{CB77AC4D-88D4-4A8C-922C-A28C19060A97}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.ActiveCfg = Debug|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.Build.0 = Debug|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.Build.0 = Release|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.ActiveCfg = Release|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.Build.0 = Release|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|Win32.ActiveCfg = Debug|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|Win32.Build.0 = Debug|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|x64.ActiveCfg = Debug|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|x64.Build.0 = Debug|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|Win32.ActiveCfg = Release|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|Win32.Build.0 = Release|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|x64.ActiveCfg = Release|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|x64.Build.0 = Release|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|Win32.Build.0 = Debug|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|x64.ActiveCfg = Debug|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|x64.Build.0 = Debug|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|Win32.ActiveCfg = Release|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|Win32.Build.0 = Release|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|x64.ActiveCfg = Release|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|x64.Build.0 = Release|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|x64.ActiveCfg = Debug|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|Win32.ActiveCfg = Release|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|x64.ActiveCfg = Release|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Win32.Build.0 = Debug|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.ActiveCfg = Debug|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.Build.0 = Debug|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Win32.ActiveCfg = Release|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Win32.Build.0 = Release|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.ActiveCfg = Release|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.Build.0 = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.Build.0 = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Win32.ActiveCfg = Release|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Win32.Build.0 = Release|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = Release|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|Win32.Build.0 = Debug|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|x64.ActiveCfg = Debug|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|x64.Build.0 = Debug|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|Win32.ActiveCfg = Release|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|Win32.Build.0 = Release|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|x64.ActiveCfg = Release|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|x64.Build.0 = Release|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|Win32.Build.0 = Debug|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|x64.ActiveCfg = Debug|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|x64.Build.0 = Debug|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|Win32.ActiveCfg = Release|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|Win32.Build.0 = Release|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|x64.ActiveCfg = Release|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3761BFB8-4345-4AC4-BE04-5ACB1DCA842C}
-	EndGlobalSection
-EndGlobal
diff --git a/modules/platforms/cpp/project/vs/ignite_x86.slnrel b/modules/platforms/cpp/project/vs/ignite_x86.slnrel
deleted file mode 100644
index 9378462..0000000
--- a/modules/platforms/cpp/project/vs/ignite_x86.slnrel
+++ /dev/null
@@ -1,98 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\core\project\vs\core.vcxproj", "{E2DEA693-F2EA-43C2-A813-053378F6E4DB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960} = {4F15669B-92EB-49F0-B774-8F19BAE0B960}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ignite", "..\..\ignite\project\vs\ignite.vcxproj", "{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960} = {4F15669B-92EB-49F0-B774-8F19BAE0B960}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binary", "..\..\binary\project\vs\binary.vcxproj", "{4F15669B-92EB-49F0-B774-8F19BAE0B960}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "..\..\odbc\project\vs\odbc.vcxproj", "{12F77E12-38FE-42D3-B1DA-7E5979362961}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\common\project\vs\common.vcxproj", "{B63F2E01-5157-4719-8491-0E1C7CD3B701}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "..\..\jni\project\vs\jni.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thin-client", "..\..\thin-client\project\vs\thin-client.vcxproj", "{5C037386-B5F5-4A58-9EE2-3D3A508AA866}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "..\..\network\project\vs\network.vcxproj", "{CB77AC4D-88D4-4A8C-922C-A28C19060A97}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.ActiveCfg = Debug|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.Build.0 = Debug|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.Build.0 = Release|Win32
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.ActiveCfg = Release|x64
-		{E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.Build.0 = Release|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|Win32.ActiveCfg = Debug|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|Win32.Build.0 = Debug|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|x64.ActiveCfg = Debug|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Debug|x64.Build.0 = Debug|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|Win32.ActiveCfg = Release|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|Win32.Build.0 = Release|Win32
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|x64.ActiveCfg = Release|x64
-		{69688B4D-3EE0-43F5-A1C6-29B5D2DDE949}.Release|x64.Build.0 = Release|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|Win32.Build.0 = Debug|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|x64.ActiveCfg = Debug|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Debug|x64.Build.0 = Debug|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|Win32.ActiveCfg = Release|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|Win32.Build.0 = Release|Win32
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|x64.ActiveCfg = Release|x64
-		{4F15669B-92EB-49F0-B774-8F19BAE0B960}.Release|x64.Build.0 = Release|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Debug|x64.ActiveCfg = Debug|x64
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|Win32.ActiveCfg = Release|Win32
-		{12F77E12-38FE-42D3-B1DA-7E5979362961}.Release|x64.ActiveCfg = Release|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Win32.Build.0 = Debug|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.ActiveCfg = Debug|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.Build.0 = Debug|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Win32.ActiveCfg = Release|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Win32.Build.0 = Release|Win32
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.ActiveCfg = Release|x64
-		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.Build.0 = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.Build.0 = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Win32.ActiveCfg = Release|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Win32.Build.0 = Release|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = Release|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|Win32.Build.0 = Debug|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|x64.ActiveCfg = Debug|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Debug|x64.Build.0 = Debug|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|Win32.ActiveCfg = Release|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|Win32.Build.0 = Release|Win32
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|x64.ActiveCfg = Release|x64
-		{5C037386-B5F5-4A58-9EE2-3D3A508AA866}.Release|x64.Build.0 = Release|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|Win32.Build.0 = Debug|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|x64.ActiveCfg = Debug|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Debug|x64.Build.0 = Debug|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|Win32.ActiveCfg = Release|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|Win32.Build.0 = Release|Win32
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|x64.ActiveCfg = Release|x64
-		{CB77AC4D-88D4-4A8C-922C-A28C19060A97}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3761BFB8-4345-4AC4-BE04-5ACB1DCA842C}
-	EndGlobalSection
-EndGlobal
diff --git a/modules/platforms/cpp/thin-client-test/project/vs/thin-client-test.vcxproj b/modules/platforms/cpp/thin-client-test/project/vs/thin-client-test.vcxproj
deleted file mode 100644
index 54d7411..0000000
--- a/modules/platforms/cpp/thin-client-test/project/vs/thin-client-test.vcxproj
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\auth_test.cpp" />
-    <ClCompile Include="..\..\src\cache_client_test.cpp" />
-    <ClCompile Include="..\..\src\compute_client_test.cpp" />
-    <ClCompile Include="..\..\src\ignite_client_test.cpp" />
-    <ClCompile Include="..\..\src\interop_test.cpp" />
-    <ClCompile Include="..\..\src\ssl_test.cpp" />
-    <ClCompile Include="..\..\src\sql_fields_query_test.cpp" />
-    <ClCompile Include="..\..\src\teamcity\teamcity_boost.cpp" />
-    <ClCompile Include="..\..\src\teamcity\teamcity_messages.cpp" />
-    <ClCompile Include="..\..\src\test_utils.cpp" />
-    <ClCompile Include="..\..\src\tx_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\complex_type.h" />
-    <ClInclude Include="..\..\include\ignite\test_type.h" />
-    <ClInclude Include="..\..\include\teamcity\teamcity_messages.h" />
-    <ClInclude Include="..\..\include\test_utils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\binary\project\vs\binary.vcxproj">
-      <Project>{4f15669b-92eb-49f0-b774-8f19bae0b960}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\project\vs\core.vcxproj">
-      <Project>{e2dea693-f2ea-43c2-a813-053378f6e4db}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\jni\project\vs\jni.vcxproj">
-      <Project>{4f7e4917-4612-4b96-9838-025711ade391}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\thin-client\project\vs\thin-client.vcxproj">
-      <Project>{5c037386-b5f5-4a58-9ee2-3d3a508aa866}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\config\auth-32.xml" />
-    <Xml Include="..\..\config\auth-default.xml" />
-    <Xml Include="..\..\config\auth.xml" />
-    <Xml Include="..\..\config\cache-32.xml" />
-    <Xml Include="..\..\config\cache-default.xml" />
-    <Xml Include="..\..\config\cache.xml" />
-    <Xml Include="..\..\config\compute-32.xml" />
-    <Xml Include="..\..\config\compute-default.xml" />
-    <Xml Include="..\..\config\compute.xml" />
-    <Xml Include="..\..\config\interop-32.xml" />
-    <Xml Include="..\..\config\interop-default.xml" />
-    <Xml Include="..\..\config\interop.xml" />
-    <Xml Include="..\..\config\non-ssl-32.xml" />
-    <Xml Include="..\..\config\non-ssl-default.xml" />
-    <Xml Include="..\..\config\non-ssl.xml" />
-    <Xml Include="..\..\config\ssl-32.xml" />
-    <Xml Include="..\..\config\ssl-default.xml" />
-    <Xml Include="..\..\config\ssl.xml" />
-    <Xml Include="..\..\config\sql-query-fields-32.xml" />
-    <Xml Include="..\..\config\sql-query-fields-default.xml" />
-    <Xml Include="..\..\config\sql-query-fields.xml" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5662F10A-9C40-45D6-AFF8-E93573FEAABA}</ProjectGuid>
-    <RootNamespace>thinclienttest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\..\thin-client\include;$(ProjectDir)\..\..\..\thin-client\os\win\i [...]
-      <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(BOOST_LIB64_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_system-$(BOOST_LIB_SUFIX_D64).lib;$(BOOST_LIB64_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_D64).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\..\thin-client\include;$(ProjectDir)\..\..\..\thin-client\os\win\i [...]
-      <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(BOOST_LIB32_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_system-$(BOOST_LIB_SUFIX_D32).lib;$(BOOST_LIB32_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_D32).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\..\thin-client\include;$(ProjectDir)\..\..\..\thin-client\os\win\i [...]
-      <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(BOOST_LIB64_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_system-$(BOOST_LIB_SUFIX_R64).lib;$(BOOST_LIB64_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_R64).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\jni\include;$(ProjectDir)\..\..\..\jni\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\..\thin-client\include;$(ProjectDir)\..\..\..\thin-client\os\win\i [...]
-      <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(BOOST_LIB32_PATH)\libboost_unit_test_framework-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_thread-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_system-$(BOOST_LIB_SUFIX_R32).lib;$(BOOST_LIB32_PATH)\libboost_chrono-$(BOOST_LIB_SUFIX_R32).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/thin-client-test/project/vs/thin-client-test.vcxproj.filters b/modules/platforms/cpp/thin-client-test/project/vs/thin-client-test.vcxproj.filters
deleted file mode 100644
index a8652dc..0000000
--- a/modules/platforms/cpp/thin-client-test/project/vs/thin-client-test.vcxproj.filters
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="TeamCity">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Code">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Configs">
-      <UniqueIdentifier>{0ed957ce-09b9-495f-8f11-7ed2b6a98c9b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\Types">
-      <UniqueIdentifier>{1a71111d-792b-48d8-b1af-044ebf8cec0e}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\ignite_client_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\teamcity\teamcity_boost.cpp">
-      <Filter>TeamCity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\teamcity\teamcity_messages.cpp">
-      <Filter>TeamCity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\test_utils.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ssl_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sql_fields_query_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\auth_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cache_client_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compute_client_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\interop_test.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\teamcity\teamcity_messages.h">
-      <Filter>TeamCity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\test_utils.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\complex_type.h">
-      <Filter>Code\Types</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\test_type.h">
-      <Filter>Code\Types</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\config\cache.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\cache-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\compute-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\interop.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\interop-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\interop-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\ssl.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\ssl-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\ssl-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\auth.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\auth-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\auth-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\non-ssl.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\non-ssl-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\non-ssl-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\sql-query-fields.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\sql-query-fields-32.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-    <Xml Include="..\..\config\sql-query-fields-default.xml">
-      <Filter>Configs</Filter>
-    </Xml>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/thin-client/CMakeLists.txt b/modules/platforms/cpp/thin-client/CMakeLists.txt
index 6be17a5..b6f41bf 100644
--- a/modules/platforms/cpp/thin-client/CMakeLists.txt
+++ b/modules/platforms/cpp/thin-client/CMakeLists.txt
@@ -55,5 +55,9 @@ target_link_libraries(${TARGET} ignite-binary ignite-network)
 
 target_include_directories(${TARGET} INTERFACE include)
 
-install(TARGETS ${TARGET} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET} 
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h*")
diff --git a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
deleted file mode 100644
index ae6de1ee..0000000
--- a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5C037386-B5F5-4A58-9EE2-3D3A508AA866}</ProjectGuid>
-    <RootNamespace>ignite.thinclient</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.thin-client</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.thin-client</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.thin-client</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ignite.thin-client</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME_X86)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";_DEBUG";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>
-      </DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>
-      </DelayLoadDLLs>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME_X86)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\..\network\include;$(ProjectDir)\..\..\..\network\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;$(OPENSSL_HOME)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;Mswsock.lib;Advapi32.lib;Shlwapi.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\ignite_client.cpp" />
-    <ClCompile Include="..\..\src\cache\query\query_fields_cursor.cpp" />
-    <ClCompile Include="..\..\src\cache\query\query_fields_row.cpp" />
-    <ClCompile Include="..\..\src\compute\compute_client.cpp" />
-    <ClCompile Include="..\..\src\impl\affinity\affinity_assignment.cpp" />
-    <ClCompile Include="..\..\src\impl\affinity\affinity_manager.cpp" />
-    <ClCompile Include="..\..\src\impl\affinity\affinity_topology_version.cpp" />
-    <ClCompile Include="..\..\src\impl\cache\cache_client_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\cache\cache_client_proxy.cpp" />
-    <ClCompile Include="..\..\src\impl\compute\compute_client_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\data_channel.cpp" />
-    <ClCompile Include="..\..\src\impl\data_router.cpp" />
-    <ClCompile Include="..\..\src\impl\ignite_client_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\ignite_node.cpp" />
-    <ClCompile Include="..\..\src\impl\message.cpp" />
-    <ClCompile Include="..\..\src\impl\protocol_version.cpp" />
-    <ClCompile Include="..\..\src\impl\remote_type_updater.cpp" />
-    <ClCompile Include="..\..\src\impl\utility.cpp" />
-    <ClCompile Include="..\..\src\impl\transactions\transaction_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\transactions\transactions_impl.cpp" />
-    <ClCompile Include="..\..\src\impl\transactions\transactions_proxy.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\impl\thin\cache\cache_client_proxy.h" />
-    <ClInclude Include="..\..\include\ignite\impl\thin\cache\query\query_fields_cursor_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\thin\cache\query\query_fields_row_impl.h" />
-    <ClInclude Include="..\..\include\ignite\impl\thin\copyable.h" />
-    <ClInclude Include="..\..\include\ignite\impl\thin\copyable_writable.h" />
-    <ClInclude Include="..\..\include\ignite\impl\thin\readable.h" />
-    <ClInclude Include="..\..\include\ignite\impl\thin\writable.h" />
-    <ClInclude Include="..\..\include\ignite\impl\thin\writable_key.h" />
-    <ClInclude Include="..\..\include\ignite\thin\cache\cache_client.h" />
-    <ClInclude Include="..\..\include\ignite\thin\cache\cache_peek_mode.h" />
-    <ClInclude Include="..\..\include\ignite\thin\cache\query\query_fields_cursor.h" />
-    <ClInclude Include="..\..\include\ignite\thin\cache\query\query_fields_row.h" />
-    <ClInclude Include="..\..\include\ignite\thin\cache\query\query_sql_fields.h" />
-    <ClInclude Include="..\..\include\ignite\thin\compute\compute_client.h" />
-    <ClInclude Include="..\..\include\ignite\thin\ignite_client.h" />
-    <ClInclude Include="..\..\include\ignite\thin\ignite_client_configuration.h" />
-    <ClInclude Include="..\..\include\ignite\thin\ssl_mode.h" />
-    <ClInclude Include="..\..\src\impl\affinity\affinity_assignment.h" />
-    <ClInclude Include="..\..\src\impl\affinity\partition_awareness_group.h" />
-    <ClInclude Include="..\..\src\impl\affinity\affinity_manager.h" />
-    <ClInclude Include="..\..\src\impl\affinity\affinity_topology_version.h" />
-    <ClInclude Include="..\..\src\impl\affinity\cache_affinity_configs.h" />
-    <ClInclude Include="..\..\src\impl\affinity\node_partitions.h" />
-    <ClInclude Include="..\..\src\impl\cache\cache_client_impl.h" />
-    <ClInclude Include="..\..\src\impl\cache\query\cursor_page.h" />
-    <ClInclude Include="..\..\src\impl\cache\query\query_fields_cursor_impl.h" />
-    <ClInclude Include="..\..\src\impl\cache\query\query_fields_row_impl.h" />
-    <ClInclude Include="..\..\src\impl\compute\compute_client_impl.h" />
-    <ClInclude Include="..\..\src\impl\data_channel.h" />
-    <ClInclude Include="..\..\src\impl\data_router.h" />
-    <ClInclude Include="..\..\src\impl\ignite_client_impl.h" />
-    <ClInclude Include="..\..\src\impl\ignite_node.h" />
-    <ClInclude Include="..\..\src\impl\message.h" />
-    <ClInclude Include="..\..\src\impl\protocol_version.h" />
-    <ClInclude Include="..\..\src\impl\remote_type_updater.h" />
-    <ClInclude Include="..\..\src\impl\response_status.h" />
-    <ClInclude Include="..\..\src\impl\utility.h" />
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transactions.h" />
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transaction.h" />
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transaction_consts.h" />
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transactions_proxy.h" />
-    <ClInclude Include="..\..\src\impl\transactions\transactions_impl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\binary\project\vs\binary.vcxproj">
-      <Project>{4f15669b-92eb-49f0-b774-8f19bae0b960}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\project\vs\common.vcxproj">
-      <Project>{b63f2e01-5157-4719-8491-0e1c7cd3b701}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\network\project\vs\network.vcxproj">
-      <Project>{cb77ac4d-88d4-4a8c-922c-a28c19060a97}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
deleted file mode 100644
index 42330f1..0000000
--- a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Code">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Code\impl">
-      <UniqueIdentifier>{9bc8816b-8ec1-4da2-9381-d194f811280c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\cache">
-      <UniqueIdentifier>{143c6ccd-4c0a-4ac3-a6a5-23aa030288db}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\cache">
-      <UniqueIdentifier>{372189a3-2442-47b1-bd75-7fe916a586ec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Code\impl\affinity">
-      <UniqueIdentifier>{23850408-24ce-4781-8f30-acfc51ced59f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\impl\ignite_client_impl.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ignite_client.cpp">
-      <Filter>Code</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cache\query\query_fields_cursor.cpp">
-      <Filter>Code\cache\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cache\query\query_fields_row.cpp">
-      <Filter>Code\cache\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compute\compute_client.cpp">
-      <Filter>Code\cache\query</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\data_router.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\protocol_version.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\message.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\utility.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cache\cache_client_proxy.cpp">
-      <Filter>Code\impl\cache</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\cache\cache_client_impl.cpp">
-      <Filter>Code\impl\cache</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\compute\compute_client_impl.cpp">
-      <Filter>Code\impl\cache</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\data_channel.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\remote_type_updater.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\ignite_node.cpp">
-      <Filter>Code\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\affinity\affinity_assignment.cpp">
-      <Filter>Code\impl\affinity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\affinity\affinity_topology_version.cpp">
-      <Filter>Code\impl\affinity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\affinity\affinity_manager.cpp">
-      <Filter>Code\impl\affinity</Filter>
-    </ClCompile>
-	<ClCompile Include="..\..\src\impl\transactions\transaction_impl.cpp">
-      <Filter>Code\impl\transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\transactions\transactions_impl.cpp">
-      <Filter>Code\impl\transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\impl\transactions\transactions_proxy.cpp">
-      <Filter>Code\impl\transactions</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ignite\thin\ignite_client.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\ignite_client_configuration.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\ssl_mode.h">
-      <Filter>Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\cache\cache_client.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\writable.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\readable.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\copyable.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\copyable_writable.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\cache\cache_client_proxy.h">
-      <Filter>Code\impl\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\cache\query\query_fields_cursor_impl.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\cache\query\query_fields_row_impl.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\impl\thin\writable_key.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\data_channel.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\data_router.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\ignite_client_impl.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\message.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\protocol_version.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\response_status.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\utility.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\cache\cache_client_impl.h">
-      <Filter>Code\impl\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\cache\query\cursor_page.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\cache\query\query_fields_cursor_impl.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\cache\query\query_fields_row_impl.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\compute\compute_client_impl.h">
-      <Filter>Code\impl\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\cache\cache_peek_mode.h">
-      <Filter>Code\cache</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\cache\query\query_fields_cursor.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\cache\query\query_fields_row.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\cache\query\query_sql_fields.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\compute\compute_client.h">
-      <Filter>Code\cache\query</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\remote_type_updater.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\ignite_node.h">
-      <Filter>Code\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\affinity\affinity_assignment.h">
-      <Filter>Code\impl\affinity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\affinity\affinity_topology_version.h">
-      <Filter>Code\impl\affinity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\affinity\cache_affinity_configs.h">
-      <Filter>Code\impl\affinity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\affinity\node_partitions.h">
-      <Filter>Code\impl\affinity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\affinity\affinity_manager.h">
-      <Filter>Code\impl\affinity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\affinity\partition_awareness_group.h">
-      <Filter>Code\impl\affinity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transactions.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transaction.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transaction_consts.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ignite\thin\transactions\transactions_proxy.h">
-      <Filter>Code\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\impl\transactions\transactions_impl.h">
-      <Filter>Code\impl\transactions</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index 0403cad..b2bc362 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -947,10 +947,9 @@
                                         <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar</exclude>
                                         <exclude>**/*.cmake</exclude>
                                         <exclude>**/CMakeLists.txt</exclude>
-                                        <exclude>**/Makefile.am</exclude>
-                                        <exclude>**/configure.ac</exclude>
-                                        <exclude>**/Makefile.amrel</exclude>
-                                        <exclude>**/configure.acrel</exclude>
+                                        <exclude>**/CMakeSettings.json.in</exclude>
+                                        <exclude>**/cmake-build-*/</exclude>
+                                        <exclude>**/.idea/**</exclude>
                                         <exclude>**/*.pc.in</exclude>
                                         <exclude>**/*.sln</exclude>
                                         <exclude>**/*.snk</exclude>
@@ -962,9 +961,6 @@
                                         <exclude>**/*.csproj</exclude>
                                         <exclude>**/*.ndproj</exclude>
                                         <exclude>**/*.csprojrel</exclude>
-                                        <exclude>**/*.vcxproj</exclude>
-                                        <exclude>**/*.vcxprojrel</exclude>
-                                        <exclude>**/*.vcxproj.filters</exclude>
                                         <exclude>**/mkbuild.cmd</exclude>
                                         <exclude>**/module.def</exclude>
                                         <exclude>**/*.fxcop</exclude>
@@ -975,7 +971,6 @@
                                         <exclude>**/teamcity_boost.cpp</exclude>
                                         <exclude>**/teamcity_messages.h</exclude>
                                         <exclude>**/teamcity_messages.cpp</exclude>
-                                        <exclude>**/project/vs/**</exclude>
                                         <exclude>**/obj/x64/**</exclude>
                                         <exclude>**/obj/x86/**</exclude>
                                         <exclude>**/bin/x64/**</exclude>