diff --git a/.gitignore b/.gitignore
index 7e38ee53..071468f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@
 
 *.coatidb
 *.suo
+*.vcxproj.user
 *.sqlite
 *.pch
 *.swp
@@ -51,7 +52,8 @@ Makefile
 
 /deployment/windows/wixSetup/bin
 /deployment/windows/wixSetup/build
-/deployment/windows/wixSetup/CustomActions/SetupAppSettings/obj/x86/Release
-/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj/x86/Release
+/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/bin
+/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj
 /deployment/windows/wixSetup/Setup/build/Setup/Release
+/deployment/windows/wixSetup/Setup/build/Setup/x64
 /deployment/windows/wixSetup/Setup/build/Setup.VC.db
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b3a4cc8..1fd80f7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,14 @@ cmake_minimum_required(VERSION 3.1)
 
 #set (CMAKE_VERBOSE_MAKEFILE ON)
 
+set (BINARY_DIR ${CMAKE_BINARY_DIR})
+
 include(cmake/add_files.cmake)
 include(cmake/create_source_groups.cmake)
 include(cmake/version.cmake)
 include(cmake/version_setup.cmake)
 include(cmake/licenses.cmake)
-
+include(cmake/setWinXxBits.cmake)
 
 # Variables --------------------------------------------------------------------
 
@@ -24,7 +26,12 @@ set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
 
 if (WIN32)
 	set(PLATFORM_INCLUDE "includesWindows.h")
-	LINK_DIRECTORIES($ENV{VLD_DIR}/lib/Win32) # this adds the library path for VLD, must be done before the project target is created
+	# this adds the library path for VLD, must be done before the project target is created
+	if(${WINXXBITS} STREQUAL "Win32")
+		LINK_DIRECTORIES($ENV{VLD_DIR}/lib/Win32)
+	else()
+		LINK_DIRECTORIES($ENV{VLD_DIR}/lib/Win64)
+	endif()
 elseif (APPLE)
 	set(PLATFORM_INCLUDE "includesMac.h")
 else ()
@@ -64,14 +71,18 @@ endif()
 
 if (UNIX AND APPLE)
 	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake" NO_DEFAULT_PATH)
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/lib/cmake/llvm" NO_DEFAULT_PATH)
 	else()
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake" NO_DEFAULT_PATH)
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/lib/cmake/llvm" NO_DEFAULT_PATH)
 	endif()
 elseif(UNIX)
 	find_package(LLVM REQUIRED PATHS "$ENV{LLVM_DIR}/lib/cmake" )
 else()
-	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
+	if(${WINXXBITS} STREQUAL "Win32")
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_win32/lib/cmake/llvm")
+	else()
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_win64/lib/cmake/llvm")
+	endif()
 endif()
 
 find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake" NO_DEFAULT_PATH)
@@ -82,9 +93,16 @@ add_definitions(${CLANG_DEFINITIONS})
 
 if(UNIX AND NOT APPLE)
 	set(BOOST_ROOT $ENV{BOOST_DIR})
-else()
+elseif(UNIX AND APPLE)
 	set(BOOST_ROOT $ENV{BOOST_159_DIR})
 	set(Boost_NO_SYSTEM_PATHS ON)
+else()
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(BOOST_ROOT "$ENV{BOOST_159_DIR}/win32")
+	else()
+		set(BOOST_ROOT "$ENV{BOOST_159_DIR}/win64")
+	endif()
+	set(Boost_NO_SYSTEM_PATHS ON)
 endif()
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ON)
@@ -101,10 +119,15 @@ if(APPLE)
 	find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
 	find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
 elseif(UNIX)
-	find_library(BOTAN ${BOTAN_VERSION} "${BOTAN_DIR}")
+	find_library(BOTAN ${BOTAN_VERSION} "$ENV{BOTAN_DIR}/lib")
 else()
-	find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
-	find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/debug")
+	if(${WINXXBITS} STREQUAL "Win32")
+		find_library(BOTAN botan "$ENV{BOTAN_DIR}/win32/release")
+		find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/win32/debug")
+	else()
+		find_library(BOTAN botan "$ENV{BOTAN_DIR}/win64/release")
+		find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/win64/debug")
+	endif()
 endif()
 message(STATUS "botanversion: ${BOTAN}")
 
@@ -116,8 +139,15 @@ endif()
 
 if(UNIX AND NOT APPLE)
 	find_path(BOTAN_INCLUDE_DIR NAMES botan/botan.h
+		HINTS "$ENV{BOTAN_DIR}/include"
 		PATH_SUFFIXES ${BOTAN_VERSION}
 		DOC "The Botan include directory")
+elseif(WIN32)
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}/win32//build/include")
+	else()
+		set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}/win64/build/include")
+	endif()
 else()
 	set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}/build/include")
 endif()
@@ -129,6 +159,15 @@ endif()
 
 # Lib License -------------------------------------------------------------------
 
+if (UNIX)
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib/")
+else ()
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/lib/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
+endif ()
+
 add_subdirectory(src/lib_license)
 
 add_library(${LIB_LICENSE_PROJECT_NAME} ${LIB_LICENSE_FILES})
@@ -180,7 +219,7 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_java"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+		"${CMAKE_BINARY_DIR}/src/lib_license"
 )
 
 target_include_directories(${LIB_PROJECT_NAME} SYSTEM
@@ -216,10 +255,13 @@ target_include_directories(${LIB_CXX_PROJECT_NAME} SYSTEM
 )
 
 link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
-llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver)
+llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver passes)
 
 target_link_libraries(${LIB_CXX_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
 
+if (WIN32)
+	target_link_libraries(${LIB_CXX_PROJECT_NAME} version)
+endif()
 
 # Lib Java -------------------------------------------------------------------
 
@@ -263,11 +305,23 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 # Find the QtWidgets library
-set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+if(UNIX)
+	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
 
-if(UNIX AND APPLE)
-	set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
-	set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+	if(APPLE)
+		set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
+		set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+	endif()
+
+else()
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN32_DIR}/")
+	else()
+		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN64_DIR}/")
+	endif()
+	set(Qt5Widgets_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Widgets")
+	set(Qt5PrintSupport_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5PrintSupport")
+	set(Qt5Network_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Network")
 endif()
 
 find_package(Qt5Widgets)
@@ -288,14 +342,14 @@ add_custom_target(
 	versionnumber ALL
 )
 
-add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h)
+add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/version.h)
 
 # command for versioning script
 add_custom_command(
 	TARGET versionnumber
 	PRE_BUILD
-	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
-	BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/lib_gui/version.h
+	COMMAND ${CMAKE_COMMAND} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
+	BYPRODUCTS ${CMAKE_BINARY_DIR}/src/lib_gui/version.h
 	DEPENDS ${LIB_GUI_PROJECT_NAME}
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 	COMMENT "check/update version number"
@@ -308,11 +362,11 @@ set_property(
 	TARGET ${LIB_GUI_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+		"${CMAKE_BINARY_DIR}/src/lib_gui"
+		"${CMAKE_BINARY_DIR}/src/lib_license"
 )
 
 # include external header without warnings
@@ -328,13 +382,13 @@ qt5_use_modules(${LIB_GUI_PROJECT_NAME} Network)
 # configure platform specific include file
 configure_file(
 	"${PROJECT_SOURCE_DIR}/src/lib_gui/platform_includes/includes.h.in"
-	"${PROJECT_SOURCE_DIR}/build/src/lib_gui/includes.h"
+	"${PROJECT_BINARY_DIR}/src/lib_gui/includes.h"
 )
 
 #configure the versioning file
 configure_file(
 	${CMAKE_SOURCE_DIR}/cmake/version.h.in
-	${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+	${CMAKE_BINARY_DIR}/src/lib_gui/version.h
 )
 
 # configure public key for the coati version
@@ -345,9 +399,12 @@ set(CMAKE_AUTOMOC OFF)
 # App --------------------------------------------------------------------------
 
 if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/app/")
 else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/app/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
 add_subdirectory(src/app)
@@ -356,13 +413,13 @@ add_subdirectory(src/app)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 if (WIN32)
-	file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc
+	file(WRITE ${CMAKE_BINARY_DIR}/Coati.rc
 		"// Icon with lowest ID value placed first to ensure application icon\n"
 		"// remains consistent on all systems.\n"
-		"IDI_ICON1               ICON                    \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
+		"IDI_ICON1               ICON                    \"${CMAKE_BINARY_DIR}/coati.ico\"\n"
 	)
 
-	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_BINARY_DIR}/Coati.rc)
 
 	# hide the console when running a release build.
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
@@ -388,9 +445,8 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_java"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
-		#"${CMAKE_SOURCE_DIR}/build/src/app"
+		"${CMAKE_BINARY_DIR}/src/lib_gui"
+		"${CMAKE_BINARY_DIR}/src/lib_license"
 )
 
 target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -458,9 +514,12 @@ endif ()
 add_subdirectory(src/license_generator)
 
 if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/${CMAKE_BUILD_TYPE})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/license_generator/")
 else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/)
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/license_generator/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
 add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES})
@@ -486,9 +545,12 @@ target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NA
 # CxxTest ----------------------------------------------------------------------
 
 if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/${CMAKE_BUILD_TYPE})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/test/")
 else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/)
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/test/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
 add_subdirectory(src/test)
@@ -503,7 +565,7 @@ add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES} )
 
 create_source_groups(${TEST_FILES})
 
-target_link_libraries(${TEST_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
+target_link_libraries(${TEST_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME})
 
 find_package(CxxTest)
 if (CXXTEST_FOUND)
@@ -512,6 +574,7 @@ if (CXXTEST_FOUND)
 		PROPERTY INCLUDE_DIRECTORIES
 			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/lib"
+			"${CMAKE_SOURCE_DIR}/src/lib_gui"
 			"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 			"${CMAKE_SOURCE_DIR}/src/lib_java"
 			"${CMAKE_SOURCE_DIR}/src/external"
@@ -532,7 +595,7 @@ if (WIN32)
 	add_custom_command(
 		TARGET ${TEST_PROJECT_NAME}
 		POST_BUILD
-		COMMAND cd $(ProjectDir)../bin/test/\n$(OutDir)$(TargetName)$(TargetExt)
+		COMMAND cd $(ProjectDir)../../bin/test/\n$(OutDir)$(TargetName)$(TargetExt)
 		COMMENT "Running unittest code"
 	)
 
diff --git a/README.md b/README.md
index 0e9e29c0..46d0a4d7 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@
 #### External Software
 
 * JDK 1.8
-* QT 5.6
+* QT 5.8
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
-* Clang & LLVM 3.8 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Clang & LLVM 3.9 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.59
 * Botan 1.11.34
 
@@ -16,13 +16,17 @@ also something about java, but who knows...
 
 #### Environment Variables
 
-* QT_DIR - .../Qt/Qt5.6.0/5.6/<IDE>
 * CXX_TEST_DIR - .../cxxtest-4.3
 * CLANG_DIR - .../clang-llvm
 * BOOST_159_DIR - .../boost_1_59_0
 * BOTAN_DIR - .../Botan-1.11.34
 
-For Win32:
+For MacOS and Linux
+* QT_DIR - .../Qt/Qt5.8.0/5.8/<IDE>
+
+For Windows:
+* QT_WIN32_DIR - .../Qt/Qt5.8.0/win32/5.8/msvc2015<IDE>
+* QT_WIN64_DIR - .../Qt/Qt5.8.0/win64/5.8/msvc2015_64<IDE>
 * VLD_DIR - .../Visual Leak Detector
 * path
 	- apped path to git.exe
@@ -30,17 +34,42 @@ For Win32:
 	- append path to VisualStudio/Common7/Tools
 	- append path to VisualStudio/Common7/IDE
 
+##### Clang setup
+
+For Windows:
+Execute Cmake twice (once for each target compiler (32 and 64 bit)). Set the respective build path to ${CLANG_DIR}/build_win32 or ${CLANG_DIR}/build_win64
+
+##### Boost setup
+
+For Windows:
+Build the Boost libs for 32 and 64 bit. Create the subdirectories ${BOOST_159_DIR}/win32 and ${BOOST_159_DIR}/win64 and copy the ${BOOST_159_DIR}/boost folder into each of those platform specific directories. Also move the platform specific libs into the respective ( ${BOOST_159_DIR}/win32/lib and ${BOOST_159_DIR}/win64/lib) folder.
+
 ##### Botan setup
 
+For Windows
+
+Extract the contents of your Botan package into "${BOTAN_DIR}/win32". Duplicate that folder and rename it "win64".
+
+Build 32 bit debug lib in ${BOTAN_DIR}/win32/debug
+$ python configure.py --cc=msvc --cpu=x86_32 --disable-shared --no-optimizations --with-debug-info
+
+Build 32 bit release lib in ${BOTAN_DIR}/win32/release
+$ python configure.py --cc=msvc --cpu=x86_32 --disable-shared
+
+To build the 64 bit lib start the VS command prompt with the "amd64" argument as described here:https://msdn.microsoft.com/en-us/library/x4d2c09s.aspx
+
+Build 64 bit debug lib in ${BOTAN_DIR}/win64/debug
+$ python configure.py --cc=msvc --cpu=x86_64 --disable-shared --no-optimizations --with-debug-info
+
+Build 64 bit release lib in ${BOTAN_DIR}/win64/release
+$ python configure.py --cc=msvc --cpu=x86_64 --disable-shared
+
+
+For MacOS and Linux
+
 Build release lib in ${BOTAN_DIR}/release
 Build debug lib in ${BOTAN_DIR}/debug
 
-for Windows release build:
-$ python configure.py --cc=msvc --cpu=x86_32 --disable-shared
-
-for Windows debug build:
-python configure.py --cc=msvc --cpu=x86_32 --disable-shared --no-optimizations --with-debug-info
-
 for Mac:
 $ python configure.py --disable-shared --disable-modules=darwin_secrandom
 
diff --git a/bin/app/data/gui/graph_view/images/zoomin.png b/bin/app/data/gui/graph_view/images/zoom_in.png
similarity index 100%
rename from bin/app/data/gui/graph_view/images/zoomin.png
rename to bin/app/data/gui/graph_view/images/zoom_in.png
diff --git a/bin/app/data/gui/graph_view/images/zoomout.png b/bin/app/data/gui/graph_view/images/zoom_out.png
similarity index 100%
rename from bin/app/data/gui/graph_view/images/zoomout.png
rename to bin/app/data/gui/graph_view/images/zoom_out.png
diff --git a/bin/app/data/install/uninstall_wix.bat b/bin/app/data/install/uninstall_wix.bat
deleted file mode 100644
index b1264152..00000000
--- a/bin/app/data/install/uninstall_wix.bat
+++ /dev/null
@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /x {92dd6ab1-78b3-49a7-aa33-338964c20969}
diff --git a/bin/app/data/install/uninstall_wix_win32.bat b/bin/app/data/install/uninstall_wix_win32.bat
new file mode 100644
index 00000000..12ff141a
--- /dev/null
+++ b/bin/app/data/install/uninstall_wix_win32.bat
@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /x {a2c6d195-ac5c-4ba4-b26b-93a057254a06}
diff --git a/bin/app/data/install/uninstall_wix_win64.bat b/bin/app/data/install/uninstall_wix_win64.bat
new file mode 100644
index 00000000..89d0217d
--- /dev/null
+++ b/bin/app/data/install/uninstall_wix_win64.bat
@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /x {6931fab2-7683-421a-ac7e-9d26b8ca123e}
diff --git a/cmake/CLANGConfig.cmake b/cmake/CLANGConfig.cmake
index cce5f380..b947908d 100644
--- a/cmake/CLANGConfig.cmake
+++ b/cmake/CLANGConfig.cmake
@@ -9,7 +9,11 @@ if (UNIX AND APPLE)
 elseif(UNIX)
 	set(CLANG_BUILD_PATH "$ENV{LLVM_DIR}")
 else()
-	set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build")
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_win32")
+	else()
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_win64")
+	endif()
 endif()
 
 if (UNIX AND NOT APPLE)
diff --git a/cmake/LinuxPackage.cmake b/cmake/LinuxPackage.cmake
index 1efb59fd..c7a12c2b 100644
--- a/cmake/LinuxPackage.cmake
+++ b/cmake/LinuxPackage.cmake
@@ -158,11 +158,10 @@ INSTALL(PROGRAMS
 	COMPONENT FULL
 )
 
-INSTALL(PROGRAMS
-	${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_upx
+INSTALL(TARGETS
+	${APP_PROJECT_NAME}
 	DESTINATION Coati
 	COMPONENT FULL
-	RENAME Coati
 )
 
 # SET(CPACK_GENERATOR "DEB;TGZ")
diff --git a/cmake/licenses.cmake b/cmake/licenses.cmake
index a5862c4f..fc45c3fc 100644
--- a/cmake/licenses.cmake
+++ b/cmake/licenses.cmake
@@ -36,5 +36,5 @@ set(LICENSE_ARRAY "${LICENSE_ARRAY}\n")
 
 configure_file(
     ${CMAKE_SOURCE_DIR}/cmake/licenses.h.in
-    ${CMAKE_SOURCE_DIR}/build/src/lib_gui/licenses.h
+    ${CMAKE_BINARY_DIR}/src/lib_gui/licenses.h
 )
diff --git a/cmake/pre_install_linux.cmake b/cmake/pre_install_linux.cmake
index e3d458a3..fd5c28ed 100644
--- a/cmake/pre_install_linux.cmake
+++ b/cmake/pre_install_linux.cmake
@@ -12,38 +12,21 @@ function(Run)
 endfunction()
 
 # upx
-	set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
+	set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../build/Release/app)
 
 	execute_process(
 		COMMAND ${upxPath}/Coati -z ${CMAKE_CURRENT_LIST_DIR}/../setup/license.txt
 	)
 
 	execute_process(
-		COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tictactoe/tictactoe.coatiproject
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tictactoe/tictactoe.coatiproject
 	)
 
 	execute_process(
-		COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tutorial/tutorial.coatiproject
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tutorial/tutorial.coatiproject
 	)
 
 	execute_process(
-			COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/javaparser/javaparser.coatiproject
-	)
-SET (NO_UPX 1)
-
-if (NO_UPX)
-	execute_process(
-		COMMAND echo "UPX"
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/javaparser/javaparser.coatiproject
 	)
 
-	execute_process(
-		COMMAND rm ${upxPath}/Coati_upx
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${upxPath}/Coati ${upxPath}/Coati_upx
-	)
-else()
-	Print("Remove old Coati_upx")
-	Run(rm ${upxPath}/Coati_upx)
-	Print("upx Coati")
-	Run(upx --brute ${upxPath}/Coati -o ${upxPath}/Coati_upx)
-endif()
-
diff --git a/cmake/publicKey.cmake b/cmake/publicKey.cmake
index f4227c7e..aa0d5b48 100644
--- a/cmake/publicKey.cmake
+++ b/cmake/publicKey.cmake
@@ -20,5 +20,5 @@ endif()
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/PublicKey.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_license/PublicKey.h
+  ${CMAKE_BINARY_DIR}/src/lib_license/PublicKey.h
 )
\ No newline at end of file
diff --git a/cmake/setWinXxBits.cmake b/cmake/setWinXxBits.cmake
new file mode 100644
index 00000000..f116f9a4
--- /dev/null
+++ b/cmake/setWinXxBits.cmake
@@ -0,0 +1,13 @@
+string(REGEX MATCH "64" MATCH_64 ${CMAKE_GENERATOR})
+
+if("${MATCH_64}" STREQUAL "64")
+	message(STATUS "Target is 64 bits")
+		if (WIN32)
+			set(WINXXBITS Win64)
+		endif(WIN32)
+else()
+	message(STATUS "Target is 32 bits")
+		if (WIN32)
+			set(WINXXBITS Win32)
+		endif(WIN32)
+endif()
\ No newline at end of file
diff --git a/cmake/version.cmake b/cmake/version.cmake
index 9530c46c..140179e2 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -44,5 +44,5 @@ message(STATUS "Git version number: " ${GIT_VERSION_NUMBER} )
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/version.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+  ${BINARY_DIR}/src/lib_gui/version.h
 )
diff --git a/deployment/windows/wixSetup/CustomActions/CustomActions.VC.db b/deployment/windows/wixSetup/CustomActions/CustomActions.VC.db
new file mode 100644
index 00000000..513f575c
Binary files /dev/null and b/deployment/windows/wixSetup/CustomActions/CustomActions.VC.db differ
diff --git a/deployment/windows/wixSetup/CustomActions/CustomActions.sln b/deployment/windows/wixSetup/CustomActions/CustomActions.sln
index fbe80bb7..7c3d0cb0 100644
--- a/deployment/windows/wixSetup/CustomActions/CustomActions.sln
+++ b/deployment/windows/wixSetup/CustomActions/CustomActions.sln
@@ -1,34 +1,30 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetupAppSettings", "SetupAppSettings\SetupAppSettings.csproj", "{A3901962-55C5-457B-873D-5842F2B3B2BE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UninstallRemoveLogFolder", "UninstallRemoveLogFolder\UninstallRemoveLogFolder.csproj", "{7B853830-9077-4803-8ADF-12D7B2886958}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|Any CPU.ActiveCfg = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|Any CPU.Build.0 = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|x86.ActiveCfg = Debug|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|x86.Build.0 = Debug|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|Any CPU.ActiveCfg = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|Any CPU.Build.0 = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|x86.ActiveCfg = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|x86.Build.0 = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|Any CPU.ActiveCfg = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|Any CPU.Build.0 = Release|x86
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x64.ActiveCfg = Debug|x64
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x64.Build.0 = Debug|x64
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x86.ActiveCfg = Debug|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x86.Build.0 = Debug|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|Any CPU.ActiveCfg = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|Any CPU.Build.0 = Release|x86
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x64.ActiveCfg = Release|x64
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x64.Build.0 = Release|x64
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x86.ActiveCfg = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
diff --git a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.config b/deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.config
deleted file mode 100644
index de951b78..00000000
--- a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.config
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup useLegacyV2RuntimeActivationPolicy="true">
-
-        <!--
-          Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
-          the custom action should run on. If no versions are specified, the chosen version of the runtime
-          will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.
-
-          WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
-          problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
-          only the version(s) of the .NET Framework runtime that you have tested against.
-
-          Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.
-
-          In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies 
-          by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".
-
-          For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
-        -->
-
-        <supportedRuntime version="v4.0" />
-        <supportedRuntime version="v2.0.50727"/>
-
-    </startup>
-
-    <!--
-      Add additional configuration settings here. For more information on application config files,
-      see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
-    -->
-
-</configuration>
diff --git a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.cs b/deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.cs
deleted file mode 100644
index 08759b18..00000000
--- a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Deployment.WindowsInstaller;
-using System.Xml;
-
-namespace SetupAppSettings
-{
-    public class CustomActions
-    {
-        [CustomAction]
-        public static ActionResult Main(Session session)
-        {
-            session.Log("Configuring AppSettings");
-
-            try
-            {
-                SetupAppSettings();
-            }
-            catch(Exception e)
-            {
-                session.Log("Failed to configure AppSettings.");
-                session.Log("Exception: " + e.ToString());
-                return ActionResult.NotExecuted;
-            }
-
-            session.Log("Done configuring AppSettings");
-
-            return ActionResult.Success;
-        }
-
-        private static void SetupAppSettings()
-        {
-            string appDataCoatiPath = Environment.GetEnvironmentVariable("APPDATA") + "\\..\\local\\Coati Software\\Coati\\";
-            string appSettingsPath = appDataCoatiPath + "ApplicationSettings.xml";
-            string projectsPath = appDataCoatiPath + "projects\\";
-
-            XmlDocument appSettings = new XmlDocument();
-            appSettings.Load(@appSettingsPath);
-
-            XmlNode recentProjects = appSettings.SelectSingleNode("config/user/recent_projects");
-            recentProjects.RemoveAll();
-
-            XmlNode tutorial = appSettings.CreateElement("recent_project");
-            tutorial.InnerText = projectsPath + "tutorial\\tutorial.coatiproject";
-            recentProjects.AppendChild(tutorial);
-
-            XmlNode tictactoe = appSettings.CreateElement("recent_project");
-            tictactoe.InnerText = projectsPath + "tictactoe\\tictactoe.coatiproject";
-            recentProjects.AppendChild(tictactoe);
-
-            XmlNode javaparser = appSettings.CreateElement("recent_project");
-            javaparser.InnerText = projectsPath + "javaparser\\javaparser.coatiproject";
-            recentProjects.AppendChild(javaparser);
-
-            appSettings.Save(appSettingsPath);
-        }
-    }
-}
diff --git a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/Properties/AssemblyInfo.cs b/deployment/windows/wixSetup/CustomActions/SetupAppSettings/Properties/AssemblyInfo.cs
deleted file mode 100644
index c5ac47ce..00000000
--- a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FooAction")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FooAction")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a3901962-55c5-457b-873d-5842f2b3b2be")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/SetupAppSettings.csproj b/deployment/windows/wixSetup/CustomActions/SetupAppSettings/SetupAppSettings.csproj
deleted file mode 100644
index db5905f7..00000000
--- a/deployment/windows/wixSetup/CustomActions/SetupAppSettings/SetupAppSettings.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A3901962-55C5-457B-873D-5842F2B3B2BE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SetupAppSettings</RootNamespace>
-    <AssemblyName>SetupAppSettings</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\build\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\build\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.Deployment.WindowsInstaller">
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomAction.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Content Include="CustomAction.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(WixCATargetsPath)" />
-</Project>
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/UninstallRemoveLogFolder.csproj b/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/UninstallRemoveLogFolder.csproj
index daa66232..c145e29c 100644
--- a/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/UninstallRemoveLogFolder.csproj
+++ b/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/UninstallRemoveLogFolder.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -32,6 +32,24 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\build\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\..\build\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj b/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj
index 0ad1f5a0..b184699b 100644
--- a/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj
+++ b/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj
@@ -105,7 +105,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -138,7 +138,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/deployment/windows/wixSetup/Setup/src/main.cpp b/deployment/windows/wixSetup/Setup/src/main.cpp
index c97b1cb8..93fdc550 100644
--- a/deployment/windows/wixSetup/Setup/src/main.cpp
+++ b/deployment/windows/wixSetup/Setup/src/main.cpp
@@ -4,8 +4,11 @@
 int main()
 {
 	HKEY hKey;
+#ifdef WIN64
+	LONG lResult = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Coati Software OG\\Coati 64-bit\\coatiSoftwareAppData"), 0, KEY_READ, &hKey);
+#else
 	LONG lResult = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Coati Software OG\\Coati\\coatiSoftwareAppData"), 0, KEY_READ, &hKey);
-
+#endif
 	if (lResult == ERROR_SUCCESS)
 	{
 		std::cout << "Coati found" << std::endl;
diff --git a/deployment/windows/wixSetup/appDataDir.wxs b/deployment/windows/wixSetup/appDataDir.wxs
index a48dd469..8151cadd 100644
--- a/deployment/windows/wixSetup/appDataDir.wxs
+++ b/deployment/windows/wixSetup/appDataDir.wxs
@@ -1,447 +1,454 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+<?if $(sys.BUILDARCH) = x64 ?>
+	<?define Win64 = "yes" ?>
+<?else ?>
+	<?define Win64 = "no" ?>
+<?endif ?>
+	
 	<Fragment>
 		<DirectoryRef Id='CoatiAppData'>			
-						<Directory Id="SampleProjects" Name="projects">
+			<Directory Id="SampleProjects" Name="projects">
+			
+				<Component Id="SampleProjects" Guid="12F6C3BE-CE83-441A-8A5D-E49EA1483F24" Win64="$(var.Win64)">
+					<RemoveFolder Id='SampleProjects' On='uninstall' />
+					<RegistryValue Root='HKCU' Key='SampleProjectDir' Type='string' Value='' KeyPath='yes' />
+				</Component>
+			
+				<Directory Id="SampleProjectTictactoe" Name="tictactoe">
+					<Component Id="TictactoeCoatiproject" Guid="E353FD02-79FD-4409-9874-3282B038DD12" Win64="$(var.Win64)">
+						<CreateFolder />
+						<RemoveFolder Id='SampleProjectTictactoe' On='uninstall' />
+						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeProjectKey" Root="HKCU" >
+							<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+						</RegistryKey>
+						<File Id='TictactoeDb' Name='tictactoe.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatidb' KeyPath='no' />
+						<File Id='TictactoeProject' Name='tictactoe.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatiproject' KeyPath='no' />
+					</Component>
+					
+					<Directory Id="TictactoeSrc" Name="src">
+						<Component Id="TictactoeCode" Guid="393ED988-A69D-4B10-974A-401EBB56C6A3" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='TictactoeSrc' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeCodeKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+							<File Id='ArtificialPlayer' Name='artificial_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.cpp' KeyPath='no' />
+							<File Id='ArtificialPlayerHeader' Name='artificial_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.h' KeyPath='no' />
+							<File Id='Field' Name='field.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.cpp' KeyPath='no' />
+							<File Id='FieldHeader' Name='field.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.h' KeyPath='no' />
+							
+							<File Id='HumanPlayer' Name='human_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.cpp' KeyPath='no' />
+							<File Id='HumanPlayerHeader' Name='human_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.h' KeyPath='no' />
+							
+							<File Id='IO' Name='io.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.cpp' KeyPath='no' />
+							<File Id='IOHeader' Name='io.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.h' KeyPath='no' />
+							
+							<File Id='tictactoeMain' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/main.cpp' KeyPath='no' />
+							
+							<File Id='Player' Name='player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.cpp' KeyPath='no' />
+							<File Id='PlayerHeader' Name='player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.h' KeyPath='no' />
+							
+							<File Id='tictactoeFile' Name='tictactoe.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.cpp' KeyPath='no' />
+							<File Id='tictactoeHeader' Name='tictactoe.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.h' KeyPath='no' />
+						</Component>
 						
-							<Component Id="SampleProjects" Guid="12F6C3BE-CE83-441A-8A5D-E49EA1483F24">
-								<RemoveFolder Id='SampleProjects' On='uninstall' />
-								<RegistryValue Root='HKCU' Key='SampleProjectDir' Type='string' Value='' KeyPath='yes' />
+					</Directory>
+					
+				</Directory>
+				
+				<Directory Id="SampleProjectTutorial" Name="tutorial">
+					<Component Id="TutorialCoatiproject" Guid="D7976D20-0447-4628-942B-0C8BE49E190E" Win64="$(var.Win64)">
+						<CreateFolder />
+						<RemoveFolder Id='SampleProjectTutorial' On='uninstall' />
+						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialProjectKey" Root="HKCU" >
+							<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+						</RegistryKey>
+						<File Id='TutorialDb' Name='tutorial.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatidb' KeyPath='no' />
+						<File Id='TutorialProject' Name='tutorial.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatiproject' KeyPath='no' />
+					</Component>
+					
+					<Directory Id="TutorialSrc" Name="src">
+						<Component Id="TutorialCode" Guid="DA247C7A-16F4-4297-928D-02C713B9967A" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='TutorialSrc' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialCodeKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+							
+							<File Id='CodeTutorial1Header' Name='code_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_1.h' KeyPath='no' />
+							<File Id='CodeTutorial2Header' Name='code_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_2.h' KeyPath='no' />
+							<File Id='CodeTutorial3Header' Name='code_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_3.h' KeyPath='no' />
+							<File Id='GraphTutorial1Header' Name='graph_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_1.h' KeyPath='no' />
+							<File Id='GraphTutorial2Header' Name='graph_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_2.h' KeyPath='no' />
+							<File Id='GraphTutorial3Header' Name='graph_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_3.h' KeyPath='no' />
+							<File Id='GraphTutorial4Header' Name='graph_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_4.h' KeyPath='no' />
+							<File Id='MainCpp' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/main.cpp' KeyPath='no' />
+							<File Id='MyFirstStepHeader' Name='my_first_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_first_step.h' KeyPath='no' />
+							<File Id='MyNextStepHeader' Name='my_next_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_next_step.h' KeyPath='no' />
+							<File Id='SearchTutorial1Header' Name='search_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_1.h' KeyPath='no' />
+							<File Id='SearchTutorial2Header' Name='search_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_2.h' KeyPath='no' />
+							<File Id='SearchTutorial3Header' Name='search_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_3.h' KeyPath='no' />
+							<File Id='SearchTutorial4Header' Name='search_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_4.h' KeyPath='no' />
+							<File Id='SearchTutorial5Header' Name='search_tutorial_5.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_5.h' KeyPath='no' />
+							<File Id='StartExploringHeader' Name='start_exploring.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/start_exploring.h' KeyPath='no' />
+							<File Id='TheCentralHubHeader' Name='the_central_hub.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/the_central_hub.h' KeyPath='no' />
+							<File Id='UtilityHeader' Name='utility.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/utility.h' KeyPath='no' />
+						</Component>
+					</Directory>
+					
+				</Directory>
+				
+				<Directory Id="SampleProjectJavaparser" Name="javaparser">
+					<Component Id="JavaparserCoatiproject" Guid="39B413EF-C9F4-4B06-BF91-028C7D931303" Win64="$(var.Win64)">
+						<CreateFolder />
+						<RemoveFolder Id='SampleProjectJavaparser' On='uninstall' />
+						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\JavaparserCoatiprojectKey" Root="HKCU" >
+							<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+						</RegistryKey>
+						<File Id='JavaparserDb' Name='javaparser.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatidb' KeyPath='no' />
+						<File Id='JavaparserProject' Name='javaparser.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatiproject' KeyPath='no' />
+					</Component>
+					<Directory Id="SampleProjectJavaparserSrc" Name="src">
+						<Component Id="SampleProjectJavaparserSrcFolder" Guid="560AEF91-AE8A-485B-BC69-928D3584EE05" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='SampleProjectJavaparserSrc' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcFolderKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+						</Component>
+						<Directory Id="SampleProjectJavaparserSrcMain" Name="main">
+							<Component Id="SampleProjectJavaparserSrcMainFolder" Guid="5FE4394F-7240-40F8-90E9-B1622AB2584F" Win64="$(var.Win64)">
+								<CreateFolder />
+								<RemoveFolder Id='SampleProjectJavaparserSrcMain' On='uninstall' />
+								<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainFolderKey" Root="HKCU" >
+									<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+								</RegistryKey>
 							</Component>
-						
-							<Directory Id="SampleProjectTictactoe" Name="tictactoe">
-								<Component Id="TictactoeCoatiproject" Guid="E353FD02-79FD-4409-9874-3282B038DD12">
+							<Directory Id="SampleProjectJavaparserSrcMainJava" Name="java">
+								<Component Id="SampleProjectJavaparserSrcMainJavaFolder" Guid="188F7773-E4F4-41A7-8644-0ED2F7945294" Win64="$(var.Win64)">
 									<CreateFolder />
-									<RemoveFolder Id='SampleProjectTictactoe' On='uninstall' />
-									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeProjectKey" Root="HKCU" >
+									<RemoveFolder Id='SampleProjectJavaparserSrcMainJava' On='uninstall' />
+									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaFolderKey" Root="HKCU" >
 										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 									</RegistryKey>
-									<File Id='TictactoeDb' Name='tictactoe.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatidb' KeyPath='no' />
-									<File Id='TictactoeProject' Name='tictactoe.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatiproject' KeyPath='no' />
 								</Component>
-								
-								<Directory Id="TictactoeSrc" Name="src">
-									<Component Id="TictactoeCode" Guid="393ED988-A69D-4B10-974A-401EBB56C6A3">
+								<Directory Id="SampleProjectJavaparserSrcMainJavaCom" Name="com">
+									<Component Id="SampleProjectJavaparserSrcMainJavaComFolder" Guid="D658E654-6E34-4616-BBA8-56585AEA1610" Win64="$(var.Win64)">
 										<CreateFolder />
-										<RemoveFolder Id='TictactoeSrc' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeCodeKey" Root="HKCU" >
-											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-										</RegistryKey>
-										<File Id='ArtificialPlayer' Name='artificial_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.cpp' KeyPath='no' />
-										<File Id='ArtificialPlayerHeader' Name='artificial_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.h' KeyPath='no' />
-										<File Id='Field' Name='field.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.cpp' KeyPath='no' />
-										<File Id='FieldHeader' Name='field.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.h' KeyPath='no' />
-										
-										<File Id='HumanPlayer' Name='human_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.cpp' KeyPath='no' />
-										<File Id='HumanPlayerHeader' Name='human_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.h' KeyPath='no' />
-										
-										<File Id='IO' Name='io.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.cpp' KeyPath='no' />
-										<File Id='IOHeader' Name='io.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.h' KeyPath='no' />
-										
-										<File Id='tictactoeMain' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/main.cpp' KeyPath='no' />
-										
-										<File Id='Player' Name='player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.cpp' KeyPath='no' />
-										<File Id='PlayerHeader' Name='player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.h' KeyPath='no' />
-										
-										<File Id='tictactoeFile' Name='tictactoe.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.cpp' KeyPath='no' />
-										<File Id='tictactoeHeader' Name='tictactoe.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.h' KeyPath='no' />
-									</Component>
-									
-								</Directory>
-								
-							</Directory>
-							
-							<Directory Id="SampleProjectTutorial" Name="tutorial">
-								<Component Id="TutorialCoatiproject" Guid="D7976D20-0447-4628-942B-0C8BE49E190E">
-									<CreateFolder />
-									<RemoveFolder Id='SampleProjectTutorial' On='uninstall' />
-									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialProjectKey" Root="HKCU" >
-										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-									</RegistryKey>
-									<File Id='TutorialDb' Name='tutorial.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatidb' KeyPath='no' />
-									<File Id='TutorialProject' Name='tutorial.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatiproject' KeyPath='no' />
-								</Component>
-								
-								<Directory Id="TutorialSrc" Name="src">
-									<Component Id="TutorialCode" Guid="DA247C7A-16F4-4297-928D-02C713B9967A">
-										<CreateFolder />
-										<RemoveFolder Id='TutorialSrc' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialCodeKey" Root="HKCU" >
-											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-										</RegistryKey>
-										
-										<File Id='CodeTutorial1Header' Name='code_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_1.h' KeyPath='no' />
-										<File Id='CodeTutorial2Header' Name='code_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_2.h' KeyPath='no' />
-										<File Id='CodeTutorial3Header' Name='code_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_3.h' KeyPath='no' />
-										<File Id='GraphTutorial1Header' Name='graph_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_1.h' KeyPath='no' />
-										<File Id='GraphTutorial2Header' Name='graph_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_2.h' KeyPath='no' />
-										<File Id='GraphTutorial3Header' Name='graph_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_3.h' KeyPath='no' />
-										<File Id='GraphTutorial4Header' Name='graph_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_4.h' KeyPath='no' />
-										<File Id='MainCpp' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/main.cpp' KeyPath='no' />
-										<File Id='MyFirstStepHeader' Name='my_first_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_first_step.h' KeyPath='no' />
-										<File Id='MyNextStepHeader' Name='my_next_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_next_step.h' KeyPath='no' />
-										<File Id='SearchTutorial1Header' Name='search_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_1.h' KeyPath='no' />
-										<File Id='SearchTutorial2Header' Name='search_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_2.h' KeyPath='no' />
-										<File Id='SearchTutorial3Header' Name='search_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_3.h' KeyPath='no' />
-										<File Id='SearchTutorial4Header' Name='search_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_4.h' KeyPath='no' />
-										<File Id='SearchTutorial5Header' Name='search_tutorial_5.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_5.h' KeyPath='no' />
-										<File Id='StartExploringHeader' Name='start_exploring.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/start_exploring.h' KeyPath='no' />
-										<File Id='TheCentralHubHeader' Name='the_central_hub.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/the_central_hub.h' KeyPath='no' />
-										<File Id='UtilityHeader' Name='utility.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/utility.h' KeyPath='no' />
-									</Component>
-								</Directory>
-								
-							</Directory>
-							
-							<Directory Id="SampleProjectJavaparser" Name="javaparser">
-								<Component Id="JavaparserCoatiproject" Guid="39B413EF-C9F4-4B06-BF91-028C7D931303">
-									<CreateFolder />
-									<RemoveFolder Id='SampleProjectJavaparser' On='uninstall' />
-									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\JavaparserCoatiprojectKey" Root="HKCU" >
-										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-									</RegistryKey>
-									<File Id='JavaparserDb' Name='javaparser.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatidb' KeyPath='no' />
-									<File Id='JavaparserProject' Name='javaparser.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatiproject' KeyPath='no' />
-								</Component>
-								<Directory Id="SampleProjectJavaparserSrc" Name="src">
-									<Component Id="SampleProjectJavaparserSrcFolder" Guid="560AEF91-AE8A-485B-BC69-928D3584EE05">
-										<CreateFolder />
-										<RemoveFolder Id='SampleProjectJavaparserSrc' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcFolderKey" Root="HKCU" >
+										<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaCom' On='uninstall' />
+										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComFolderKey" Root="HKCU" >
 											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 										</RegistryKey>
 									</Component>
-									<Directory Id="SampleProjectJavaparserSrcMain" Name="main">
-										<Component Id="SampleProjectJavaparserSrcMainFolder" Guid="5FE4394F-7240-40F8-90E9-B1622AB2584F">
+									<Directory Id="SampleProjectJavaparserSrcMainJavaComGithub" Name="github">
+										<Component Id="SampleProjectJavaparserSrcMainJavaComGithubFolder" Guid="455B534F-AD59-46DD-A11D-1C4E97887614" Win64="$(var.Win64)">
 											<CreateFolder />
-											<RemoveFolder Id='SampleProjectJavaparserSrcMain' On='uninstall' />
-											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainFolderKey" Root="HKCU" >
+											<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithub' On='uninstall' />
+											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubFolderKey" Root="HKCU" >
 												<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 											</RegistryKey>
 										</Component>
-										<Directory Id="SampleProjectJavaparserSrcMainJava" Name="java">
-											<Component Id="SampleProjectJavaparserSrcMainJavaFolder" Guid="188F7773-E4F4-41A7-8644-0ED2F7945294">
+										<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparser" Name="javaparser">
+											<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserCode" Guid="80C369E9-CC0D-4C3D-A916-DC7BB42E6414" Win64="$(var.Win64)">
 												<CreateFolder />
-												<RemoveFolder Id='SampleProjectJavaparserSrcMainJava' On='uninstall' />
-												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaFolderKey" Root="HKCU" >
+												<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparser' On='uninstall' />
+												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserCodeKey" Root="HKCU" >
 													<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 												</RegistryKey>
+												<File Id='CommentsInserterJava' Name='CommentsInserter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java' KeyPath='no' />
+												<File Id='JavaParserJava' Name='JavaParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java' KeyPath='no' />
+												<File Id='PositionJava' Name='Position.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Position.java' KeyPath='no' />
+												<File Id='RangeJava' Name='Range.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Range.java' KeyPath='no' />
 											</Component>
-											<Directory Id="SampleProjectJavaparserSrcMainJavaCom" Name="com">
-												<Component Id="SampleProjectJavaparserSrcMainJavaComFolder" Guid="D658E654-6E34-4616-BBA8-56585AEA1610">
+											<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst" Name="ast">
+												<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCode" Guid="5DEA3889-E49D-450A-A6E8-E1A3C122D403" Win64="$(var.Win64)">
 													<CreateFolder />
-													<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaCom' On='uninstall' />
-													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComFolderKey" Root="HKCU" >
+													<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst' On='uninstall' />
+													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCodeKey" Root="HKCU" >
 														<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 													</RegistryKey>
+													<File Id='AccessSpecifierJava' Name='AccessSpecifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java' KeyPath='no' />
+													<File Id='CompilationUnitJava' Name='CompilationUnit.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java' KeyPath='no' />
+													<File Id='ImportDeclarationJava' Name='ImportDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java' KeyPath='no' />
+													<File Id='ModifierJava' Name='Modifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java' KeyPath='no' />
+													<File Id='NodeJava' Name='Node.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java' KeyPath='no' />
+													<File Id='PackageDeclarationJava' Name='PackageDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java' KeyPath='no' />
+													<File Id='TypeArgumentsJava' Name='TypeArguments.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java' KeyPath='no' />
+													<File Id='TypeParameterJava' Name='TypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java' KeyPath='no' />
 												</Component>
-												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithub" Name="github">
-													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubFolder" Guid="455B534F-AD59-46DD-A11D-1C4E97887614">
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody" Name="body">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCode" Guid="A6D857E0-F9D2-45FE-884A-D647B2C966C8" Win64="$(var.Win64)">
 														<CreateFolder />
-														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithub' On='uninstall' />
-														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubFolderKey" Root="HKCU" >
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCodeKey" Root="HKCU" >
 															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 														</RegistryKey>
+														<File Id='AnnotationDeclarationJava' Name='AnnotationDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java' KeyPath='no' />
+														<File Id='AnnotationMemberDeclarationJava' Name='AnnotationMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java' KeyPath='no' />
+														<File Id='BaseParameterJava' Name='BaseParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java' KeyPath='no' />
+														<File Id='BodyDeclarationJava' Name='BodyDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java' KeyPath='no' />
+														<File Id='ClassOrInterfaceDeclarationJava' Name='ClassOrInterfaceDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java' KeyPath='no' />
+														<File Id='ConstructorDeclarationJava' Name='ConstructorDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java' KeyPath='no' />
+														<File Id='EmptyMemberDeclarationJava' Name='EmptyMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java' KeyPath='no' />
+														<File Id='EmptyTypeDeclarationJava' Name='EmptyTypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java' KeyPath='no' />
+														<File Id='EnumConstantDeclarationJava' Name='EnumConstantDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java' KeyPath='no' />
+														<File Id='EnumDeclarationJava' Name='EnumDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java' KeyPath='no' />
+														<File Id='FieldDeclarationJava' Name='FieldDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java' KeyPath='no' />
+														<File Id='InitializerDeclarationJava' Name='InitializerDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java' KeyPath='no' />
+														<File Id='MethodDeclarationJava' Name='MethodDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java' KeyPath='no' />
+														<File Id='MultiTypeParameterJava' Name='MultiTypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java' KeyPath='no' />
+														<File Id='ParameterJava' Name='Parameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java' KeyPath='no' />
+														<File Id='TypeDeclarationJava' Name='TypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java' KeyPath='no' />
+														<File Id='VariableDeclaratorJava' Name='VariableDeclarator.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java' KeyPath='no' />
+														<File Id='VariableDeclaratorIdJava' Name='VariableDeclaratorId.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments" Name="comments">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCode" Guid="6CFE2814-2D70-4235-AC29-FCF6CA5A3D03" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='BlockCommentJava' Name='BlockComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java' KeyPath='no' />
+														<File Id='CommentJava' Name='Comment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java' KeyPath='no' />
+														<File Id='CommentsCollectionJava' Name='CommentsCollection.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java' KeyPath='no' />
+														<File Id='CommentsParserJava' Name='CommentsParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java' KeyPath='no' />
+														<File Id='JavadocCommentJava' Name='JavadocComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java' KeyPath='no' />
+														<File Id='LineCommentJava' Name='LineComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr" Name="expr">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCode" Guid="BAB7B080-9D4E-439A-946D-BF8B1A640170" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='AnnotationExprJava' Name='AnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java' KeyPath='no' />
+														<File Id='ArrayAccessExprJava' Name='ArrayAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java' KeyPath='no' />
+														<File Id='ArrayCreationExprJava' Name='ArrayCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java' KeyPath='no' />
+														<File Id='ArrayInitializerExprJava' Name='ArrayInitializerExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java' KeyPath='no' />
+														<File Id='AssignExprJava' Name='AssignExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java' KeyPath='no' />
+														<File Id='BinaryExprJava' Name='BinaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java' KeyPath='no' />
+														<File Id='BooleanLiteralExprJava' Name='BooleanLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java' KeyPath='no' />
+														<File Id='CastExprJava' Name='CastExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java' KeyPath='no' />
+														<File Id='CharLiteralExprJava' Name='CharLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java' KeyPath='no' />
+														<File Id='ClassExprJava' Name='ClassExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java' KeyPath='no' />
+														<File Id='ConditionalExprJava' Name='ConditionalExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java' KeyPath='no' />
+														<File Id='DoubleLiteralExprJava' Name='DoubleLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java' KeyPath='no' />
+														<File Id='EnclosedExprJava' Name='EnclosedExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java' KeyPath='no' />
+														<File Id='ExpressionJava' Name='Expression.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java' KeyPath='no' />
+														<File Id='FieldAccessExprJava' Name='FieldAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java' KeyPath='no' />
+														<File Id='InstanceOfExprJava' Name='InstanceOfExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java' KeyPath='no' />
+														<File Id='IntegerLiteralExprJava' Name='IntegerLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java' KeyPath='no' />
+														<File Id='IntegerLiteralMinValueExprJava' Name='IntegerLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java' KeyPath='no' />
+														<File Id='LambdaExprJava' Name='LambdaExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java' KeyPath='no' />
+														<File Id='LiteralExprJava' Name='LiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java' KeyPath='no' />
+														<File Id='LongLiteralExprJava' Name='LongLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java' KeyPath='no' />
+														<File Id='LongLiteralMinValueExprJava' Name='LongLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java' KeyPath='no' />
+														<File Id='MarkerAnnotationExprJava' Name='MarkerAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java' KeyPath='no' />
+														<File Id='MemberValuePairJava' Name='MemberValuePair.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java' KeyPath='no' />
+														<File Id='MethodCallExprJava' Name='MethodCallExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java' KeyPath='no' />
+														<File Id='MethodReferenceExprJava' Name='MethodReferenceExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java' KeyPath='no' />
+														<File Id='NameExprJava' Name='NameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java' KeyPath='no' />
+														<File Id='NormalAnnotationExprJava' Name='NormalAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java' KeyPath='no' />
+														<File Id='NullLiteralExprJava' Name='NullLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java' KeyPath='no' />
+														<File Id='ObjectCreationExprJava' Name='ObjectCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java' KeyPath='no' />
+														<File Id='QualifiedNameExprJava' Name='QualifiedNameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java' KeyPath='no' />
+														<File Id='SingleMemberAnnotationExprJava' Name='SingleMemberAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java' KeyPath='no' />
+														<File Id='StringLiteralExprJava' Name='StringLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java' KeyPath='no' />
+														<File Id='SuperExprJava' Name='SuperExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java' KeyPath='no' />
+														<File Id='ThisExprJava' Name='ThisExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java' KeyPath='no' />
+														<File Id='TypeExprJava' Name='TypeExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java' KeyPath='no' />
+														<File Id='UnaryExprJava' Name='UnaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java' KeyPath='no' />
+														<File Id='VariableDeclarationExprJava' Name='VariableDeclarationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes" Name="nodeTypes">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCode" Guid="F2A26343-C9CE-441A-A80A-93F3703C4ACA" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='NodeWithAnnotationsJava' Name='NodeWithAnnotations.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java' KeyPath='no' />
+														<File Id='NodeWithArraysJava' Name='NodeWithArrays.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java' KeyPath='no' />
+														<File Id='NodeWithBlockStmtJava' Name='NodeWithBlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java' KeyPath='no' />
+														<File Id='NodeWithDeclarationJava' Name='NodeWithDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java' KeyPath='no' />
+														<File Id='NodeWithJavaDocJava' Name='NodeWithJavaDoc.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java' KeyPath='no' />
+														<File Id='NodeWithMembersJava' Name='NodeWithMembers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java' KeyPath='no' />
+														<File Id='NodeWithModifiersJava' Name='NodeWithModifiers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java' KeyPath='no' />
+														<File Id='NodeWithNameJava' Name='NodeWithName.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java' KeyPath='no' />
+														<File Id='NodeWithParametersJava' Name='NodeWithParameters.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java' KeyPath='no' />
+														<File Id='NodeWithThrowableJava' Name='NodeWithThrowable.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java' KeyPath='no' />
+														<File Id='NodeWithTypeJava' Name='NodeWithType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt" Name="stmt">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCode" Guid="CA642E8B-B001-4ECC-8781-53FFA6EF442E" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='AssertStmtJava' Name='AssertStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java' KeyPath='no' />
+														<File Id='BlockStmtJava' Name='BlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java' KeyPath='no' />
+														<File Id='BreakStmtJava' Name='BreakStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java' KeyPath='no' />
+														<File Id='CatchClauseJava' Name='CatchClause.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java' KeyPath='no' />
+														<File Id='ContinueStmtJava' Name='ContinueStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java' KeyPath='no' />
+														<File Id='DoStmtJava' Name='DoStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java' KeyPath='no' />
+														<File Id='EmptyStmtJava' Name='EmptyStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java' KeyPath='no' />
+														<File Id='ExplicitConstructorInvocationStmtJava' Name='ExplicitConstructorInvocationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java' KeyPath='no' />
+														<File Id='ExpressionStmtJava' Name='ExpressionStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java' KeyPath='no' />
+														<File Id='ForeachStmtJava' Name='ForeachStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java' KeyPath='no' />
+														<File Id='ForStmtJava' Name='ForStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java' KeyPath='no' />
+														<File Id='IfStmtJava' Name='IfStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java' KeyPath='no' />
+														<File Id='LabeledStmtJava' Name='LabeledStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java' KeyPath='no' />
+														<File Id='ReturnStmtJava' Name='ReturnStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java' KeyPath='no' />
+														<File Id='StatementJava' Name='Statement.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java' KeyPath='no' />
+														<File Id='SwitchEntryStmtJava' Name='SwitchEntryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java' KeyPath='no' />
+														<File Id='SwitchStmtJava' Name='SwitchStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java' KeyPath='no' />
+														<File Id='SynchronizedStmtJava' Name='SynchronizedStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java' KeyPath='no' />
+														<File Id='ThrowStmtJava' Name='ThrowStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java' KeyPath='no' />
+														<File Id='TryStmtJava' Name='TryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java' KeyPath='no' />
+														<File Id='TypeDeclarationStmtJava' Name='TypeDeclarationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java' KeyPath='no' />
+														<File Id='WhileStmtJava' Name='WhileStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType" Name="type">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCode" Guid="BFBCF1A5-5440-40BC-BFB2-8958E1618C04" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='ClassOrInterfaceTypeJava' Name='ClassOrInterfaceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java' KeyPath='no' />
+														<File Id='IntersectionTypeJava' Name='IntersectionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java' KeyPath='no' />
+														<File Id='PrimitiveTypeJava' Name='PrimitiveType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java' KeyPath='no' />
+														<File Id='ReferenceTypeJava' Name='ReferenceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java' KeyPath='no' />
+														<File Id='TypeJava' Name='Type.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java' KeyPath='no' />
+														<File Id='UnionTypeJava' Name='UnionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java' KeyPath='no' />
+														<File Id='UnknownTypeJava' Name='UnknownType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java' KeyPath='no' />
+														<File Id='VoidTypeJava' Name='VoidType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java' KeyPath='no' />
+														<File Id='WildcardTypeJava' Name='WildcardType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor" Name="visitor">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCode" Guid="77F4C3B8-411B-4889-A900-98C43FD5F545" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='CloneVisitorJava' Name='CloneVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java' KeyPath='no' />
+														<File Id='DumpVisitorJava' Name='DumpVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java' KeyPath='no' />
+														<File Id='EqualsVisitorJava' Name='EqualsVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java' KeyPath='no' />
+														<File Id='GenericVisitorJava' Name='GenericVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java' KeyPath='no' />
+														<File Id='GenericVisitorAdapterJava' Name='GenericVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java' KeyPath='no' />
+														<File Id='ModifierVisitorAdapterJava' Name='ModifierVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java' KeyPath='no' />
+														<File Id='TreeVisitorJava' Name='TreeVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java' KeyPath='no' />
+														<File Id='VoidVisitorJava' Name='VoidVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java' KeyPath='no' />
+														<File Id='VoidVisitorAdapterJava' Name='VoidVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java' KeyPath='no' />
 													</Component>
-													<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparser" Name="javaparser">
-														<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserCode" Guid="80C369E9-CC0D-4C3D-A916-DC7BB42E6414">
-															<CreateFolder />
-															<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparser' On='uninstall' />
-															<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserCodeKey" Root="HKCU" >
-																<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-															</RegistryKey>
-															<File Id='CommentsInserterJava' Name='CommentsInserter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java' KeyPath='no' />
-															<File Id='JavaParserJava' Name='JavaParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java' KeyPath='no' />
-															<File Id='PositionJava' Name='Position.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Position.java' KeyPath='no' />
-															<File Id='RangeJava' Name='Range.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Range.java' KeyPath='no' />
-														</Component>
-														<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst" Name="ast">
-															<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCode" Guid="5DEA3889-E49D-450A-A6E8-E1A3C122D403">
-																<CreateFolder />
-																<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst' On='uninstall' />
-																<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCodeKey" Root="HKCU" >
-																	<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																</RegistryKey>
-																<File Id='AccessSpecifierJava' Name='AccessSpecifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java' KeyPath='no' />
-																<File Id='CompilationUnitJava' Name='CompilationUnit.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java' KeyPath='no' />
-																<File Id='ImportDeclarationJava' Name='ImportDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java' KeyPath='no' />
-																<File Id='ModifierJava' Name='Modifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java' KeyPath='no' />
-																<File Id='NodeJava' Name='Node.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java' KeyPath='no' />
-																<File Id='PackageDeclarationJava' Name='PackageDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java' KeyPath='no' />
-																<File Id='TypeArgumentsJava' Name='TypeArguments.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java' KeyPath='no' />
-																<File Id='TypeParameterJava' Name='TypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java' KeyPath='no' />
-															</Component>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody" Name="body">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCode" Guid="A6D857E0-F9D2-45FE-884A-D647B2C966C8">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='AnnotationDeclarationJava' Name='AnnotationDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java' KeyPath='no' />
-																	<File Id='AnnotationMemberDeclarationJava' Name='AnnotationMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java' KeyPath='no' />
-																	<File Id='BaseParameterJava' Name='BaseParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java' KeyPath='no' />
-																	<File Id='BodyDeclarationJava' Name='BodyDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java' KeyPath='no' />
-																	<File Id='ClassOrInterfaceDeclarationJava' Name='ClassOrInterfaceDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java' KeyPath='no' />
-																	<File Id='ConstructorDeclarationJava' Name='ConstructorDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java' KeyPath='no' />
-																	<File Id='EmptyMemberDeclarationJava' Name='EmptyMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java' KeyPath='no' />
-																	<File Id='EmptyTypeDeclarationJava' Name='EmptyTypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java' KeyPath='no' />
-																	<File Id='EnumConstantDeclarationJava' Name='EnumConstantDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java' KeyPath='no' />
-																	<File Id='EnumDeclarationJava' Name='EnumDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java' KeyPath='no' />
-																	<File Id='FieldDeclarationJava' Name='FieldDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java' KeyPath='no' />
-																	<File Id='InitializerDeclarationJava' Name='InitializerDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java' KeyPath='no' />
-																	<File Id='MethodDeclarationJava' Name='MethodDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java' KeyPath='no' />
-																	<File Id='MultiTypeParameterJava' Name='MultiTypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java' KeyPath='no' />
-																	<File Id='ParameterJava' Name='Parameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java' KeyPath='no' />
-																	<File Id='TypeDeclarationJava' Name='TypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java' KeyPath='no' />
-																	<File Id='VariableDeclaratorJava' Name='VariableDeclarator.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java' KeyPath='no' />
-																	<File Id='VariableDeclaratorIdJava' Name='VariableDeclaratorId.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments" Name="comments">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCode" Guid="6CFE2814-2D70-4235-AC29-FCF6CA5A3D03">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='BlockCommentJava' Name='BlockComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java' KeyPath='no' />
-																	<File Id='CommentJava' Name='Comment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java' KeyPath='no' />
-																	<File Id='CommentsCollectionJava' Name='CommentsCollection.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java' KeyPath='no' />
-																	<File Id='CommentsParserJava' Name='CommentsParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java' KeyPath='no' />
-																	<File Id='JavadocCommentJava' Name='JavadocComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java' KeyPath='no' />
-																	<File Id='LineCommentJava' Name='LineComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr" Name="expr">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCode" Guid="BAB7B080-9D4E-439A-946D-BF8B1A640170">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='AnnotationExprJava' Name='AnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java' KeyPath='no' />
-																	<File Id='ArrayAccessExprJava' Name='ArrayAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java' KeyPath='no' />
-																	<File Id='ArrayCreationExprJava' Name='ArrayCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java' KeyPath='no' />
-																	<File Id='ArrayInitializerExprJava' Name='ArrayInitializerExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java' KeyPath='no' />
-																	<File Id='AssignExprJava' Name='AssignExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java' KeyPath='no' />
-																	<File Id='BinaryExprJava' Name='BinaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java' KeyPath='no' />
-																	<File Id='BooleanLiteralExprJava' Name='BooleanLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java' KeyPath='no' />
-																	<File Id='CastExprJava' Name='CastExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java' KeyPath='no' />
-																	<File Id='CharLiteralExprJava' Name='CharLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java' KeyPath='no' />
-																	<File Id='ClassExprJava' Name='ClassExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java' KeyPath='no' />
-																	<File Id='ConditionalExprJava' Name='ConditionalExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java' KeyPath='no' />
-																	<File Id='DoubleLiteralExprJava' Name='DoubleLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java' KeyPath='no' />
-																	<File Id='EnclosedExprJava' Name='EnclosedExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java' KeyPath='no' />
-																	<File Id='ExpressionJava' Name='Expression.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java' KeyPath='no' />
-																	<File Id='FieldAccessExprJava' Name='FieldAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java' KeyPath='no' />
-																	<File Id='InstanceOfExprJava' Name='InstanceOfExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java' KeyPath='no' />
-																	<File Id='IntegerLiteralExprJava' Name='IntegerLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java' KeyPath='no' />
-																	<File Id='IntegerLiteralMinValueExprJava' Name='IntegerLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java' KeyPath='no' />
-																	<File Id='LambdaExprJava' Name='LambdaExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java' KeyPath='no' />
-																	<File Id='LiteralExprJava' Name='LiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java' KeyPath='no' />
-																	<File Id='LongLiteralExprJava' Name='LongLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java' KeyPath='no' />
-																	<File Id='LongLiteralMinValueExprJava' Name='LongLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java' KeyPath='no' />
-																	<File Id='MarkerAnnotationExprJava' Name='MarkerAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java' KeyPath='no' />
-																	<File Id='MemberValuePairJava' Name='MemberValuePair.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java' KeyPath='no' />
-																	<File Id='MethodCallExprJava' Name='MethodCallExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java' KeyPath='no' />
-																	<File Id='MethodReferenceExprJava' Name='MethodReferenceExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java' KeyPath='no' />
-																	<File Id='NameExprJava' Name='NameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java' KeyPath='no' />
-																	<File Id='NormalAnnotationExprJava' Name='NormalAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java' KeyPath='no' />
-																	<File Id='NullLiteralExprJava' Name='NullLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java' KeyPath='no' />
-																	<File Id='ObjectCreationExprJava' Name='ObjectCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java' KeyPath='no' />
-																	<File Id='QualifiedNameExprJava' Name='QualifiedNameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java' KeyPath='no' />
-																	<File Id='SingleMemberAnnotationExprJava' Name='SingleMemberAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java' KeyPath='no' />
-																	<File Id='StringLiteralExprJava' Name='StringLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java' KeyPath='no' />
-																	<File Id='SuperExprJava' Name='SuperExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java' KeyPath='no' />
-																	<File Id='ThisExprJava' Name='ThisExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java' KeyPath='no' />
-																	<File Id='TypeExprJava' Name='TypeExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java' KeyPath='no' />
-																	<File Id='UnaryExprJava' Name='UnaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java' KeyPath='no' />
-																	<File Id='VariableDeclarationExprJava' Name='VariableDeclarationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes" Name="nodeTypes">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCode" Guid="F2A26343-C9CE-441A-A80A-93F3703C4ACA">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='NodeWithAnnotationsJava' Name='NodeWithAnnotations.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java' KeyPath='no' />
-																	<File Id='NodeWithArraysJava' Name='NodeWithArrays.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java' KeyPath='no' />
-																	<File Id='NodeWithBlockStmtJava' Name='NodeWithBlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java' KeyPath='no' />
-																	<File Id='NodeWithDeclarationJava' Name='NodeWithDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java' KeyPath='no' />
-																	<File Id='NodeWithJavaDocJava' Name='NodeWithJavaDoc.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java' KeyPath='no' />
-																	<File Id='NodeWithMembersJava' Name='NodeWithMembers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java' KeyPath='no' />
-																	<File Id='NodeWithModifiersJava' Name='NodeWithModifiers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java' KeyPath='no' />
-																	<File Id='NodeWithNameJava' Name='NodeWithName.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java' KeyPath='no' />
-																	<File Id='NodeWithParametersJava' Name='NodeWithParameters.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java' KeyPath='no' />
-																	<File Id='NodeWithThrowableJava' Name='NodeWithThrowable.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java' KeyPath='no' />
-																	<File Id='NodeWithTypeJava' Name='NodeWithType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt" Name="stmt">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCode" Guid="CA642E8B-B001-4ECC-8781-53FFA6EF442E">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='AssertStmtJava' Name='AssertStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java' KeyPath='no' />
-																	<File Id='BlockStmtJava' Name='BlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java' KeyPath='no' />
-																	<File Id='BreakStmtJava' Name='BreakStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java' KeyPath='no' />
-																	<File Id='CatchClauseJava' Name='CatchClause.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java' KeyPath='no' />
-																	<File Id='ContinueStmtJava' Name='ContinueStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java' KeyPath='no' />
-																	<File Id='DoStmtJava' Name='DoStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java' KeyPath='no' />
-																	<File Id='EmptyStmtJava' Name='EmptyStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java' KeyPath='no' />
-																	<File Id='ExplicitConstructorInvocationStmtJava' Name='ExplicitConstructorInvocationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java' KeyPath='no' />
-																	<File Id='ExpressionStmtJava' Name='ExpressionStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java' KeyPath='no' />
-																	<File Id='ForeachStmtJava' Name='ForeachStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java' KeyPath='no' />
-																	<File Id='ForStmtJava' Name='ForStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java' KeyPath='no' />
-																	<File Id='IfStmtJava' Name='IfStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java' KeyPath='no' />
-																	<File Id='LabeledStmtJava' Name='LabeledStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java' KeyPath='no' />
-																	<File Id='ReturnStmtJava' Name='ReturnStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java' KeyPath='no' />
-																	<File Id='StatementJava' Name='Statement.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java' KeyPath='no' />
-																	<File Id='SwitchEntryStmtJava' Name='SwitchEntryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java' KeyPath='no' />
-																	<File Id='SwitchStmtJava' Name='SwitchStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java' KeyPath='no' />
-																	<File Id='SynchronizedStmtJava' Name='SynchronizedStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java' KeyPath='no' />
-																	<File Id='ThrowStmtJava' Name='ThrowStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java' KeyPath='no' />
-																	<File Id='TryStmtJava' Name='TryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java' KeyPath='no' />
-																	<File Id='TypeDeclarationStmtJava' Name='TypeDeclarationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java' KeyPath='no' />
-																	<File Id='WhileStmtJava' Name='WhileStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType" Name="type">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCode" Guid="BFBCF1A5-5440-40BC-BFB2-8958E1618C04">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='ClassOrInterfaceTypeJava' Name='ClassOrInterfaceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java' KeyPath='no' />
-																	<File Id='IntersectionTypeJava' Name='IntersectionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java' KeyPath='no' />
-																	<File Id='PrimitiveTypeJava' Name='PrimitiveType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java' KeyPath='no' />
-																	<File Id='ReferenceTypeJava' Name='ReferenceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java' KeyPath='no' />
-																	<File Id='TypeJava' Name='Type.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java' KeyPath='no' />
-																	<File Id='UnionTypeJava' Name='UnionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java' KeyPath='no' />
-																	<File Id='UnknownTypeJava' Name='UnknownType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java' KeyPath='no' />
-																	<File Id='VoidTypeJava' Name='VoidType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java' KeyPath='no' />
-																	<File Id='WildcardTypeJava' Name='WildcardType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor" Name="visitor">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCode" Guid="77F4C3B8-411B-4889-A900-98C43FD5F545">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='CloneVisitorJava' Name='CloneVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java' KeyPath='no' />
-																	<File Id='DumpVisitorJava' Name='DumpVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java' KeyPath='no' />
-																	<File Id='EqualsVisitorJava' Name='EqualsVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java' KeyPath='no' />
-																	<File Id='GenericVisitorJava' Name='GenericVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java' KeyPath='no' />
-																	<File Id='GenericVisitorAdapterJava' Name='GenericVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java' KeyPath='no' />
-																	<File Id='ModifierVisitorAdapterJava' Name='ModifierVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java' KeyPath='no' />
-																	<File Id='TreeVisitorJava' Name='TreeVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java' KeyPath='no' />
-																	<File Id='VoidVisitorJava' Name='VoidVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java' KeyPath='no' />
-																	<File Id='VoidVisitorAdapterJava' Name='VoidVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java' KeyPath='no' />
-																</Component>
-															</Directory>
-														</Directory>
-														<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils" Name="utils">
-															<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCode" Guid="964479AD-47EF-4CC3-AE21-8287AE5E5CEC">
-																<CreateFolder />
-																<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils' On='uninstall' />
-																<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCodeKey" Root="HKCU" >
-																	<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																</RegistryKey>
-																<File Id='ClassUtilsJava' Name='ClassUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java' KeyPath='no' />
-																<File Id='PositionUtilsJava' Name='PositionUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java' KeyPath='no' />
-																<File Id='UtilsJava' Name='Utils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java' KeyPath='no' />
-															</Component>
-														</Directory>
-													</Directory>
 												</Directory>
 											</Directory>
-										</Directory>
-										<Directory Id="SampleProjectJavaparserSrcMainJavacc" Name="javacc">
-											<Component Id="SampleProjectJavaparserSrcMainJavaccCode" Guid="F31AA381-2F1C-465A-81E1-0A7BD35314EE">
-												<CreateFolder />
-												<RemoveFolder Id='SampleProjectJavaparserSrcMainJavacc' On='uninstall' />
-												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaccCodeKey" Root="HKCU" >
-													<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-												</RegistryKey>
-												<File Id='Java_1_8Jj' Name='java_1_8.jj' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/javacc/java_1_8.jj' KeyPath='no' />
-											</Component>
+											<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils" Name="utils">
+												<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCode" Guid="964479AD-47EF-4CC3-AE21-8287AE5E5CEC" Win64="$(var.Win64)">
+													<CreateFolder />
+													<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils' On='uninstall' />
+													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCodeKey" Root="HKCU" >
+														<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+													</RegistryKey>
+													<File Id='ClassUtilsJava' Name='ClassUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java' KeyPath='no' />
+													<File Id='PositionUtilsJava' Name='PositionUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java' KeyPath='no' />
+													<File Id='UtilsJava' Name='Utils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java' KeyPath='no' />
+												</Component>
+											</Directory>
 										</Directory>
 									</Directory>
 								</Directory>
-								<Directory Id="SampleProjectJavaparserTarget" Name="target">
-									<Component Id="SampleProjectJavaparserTargetFolder" Guid="EEC88E2D-ACA7-4BBA-B3D2-E8157E8C90D1">
+							</Directory>
+							<Directory Id="SampleProjectJavaparserSrcMainJavacc" Name="javacc">
+								<Component Id="SampleProjectJavaparserSrcMainJavaccCode" Guid="F31AA381-2F1C-465A-81E1-0A7BD35314EE" Win64="$(var.Win64)">
+									<CreateFolder />
+									<RemoveFolder Id='SampleProjectJavaparserSrcMainJavacc' On='uninstall' />
+									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaccCodeKey" Root="HKCU" >
+										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+									</RegistryKey>
+									<File Id='Java_1_8Jj' Name='java_1_8.jj' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/javacc/java_1_8.jj' KeyPath='no' />
+								</Component>
+							</Directory>
+						</Directory>
+					</Directory>
+					<Directory Id="SampleProjectJavaparserTarget" Name="target">
+						<Component Id="SampleProjectJavaparserTargetFolder" Guid="EEC88E2D-ACA7-4BBA-B3D2-E8157E8C90D1" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='SampleProjectJavaparserTarget' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetFolderKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+						</Component>
+						<Directory Id="SampleProjectJavaparserTargetGeneratedSources" Name="generated-sources">
+							<Component Id="SampleProjectJavaparserTargetGeneratedSourcesFolder" Guid="51670973-3944-4CB5-BE82-94BD2133FAF4" Win64="$(var.Win64)">
+								<CreateFolder />
+								<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSources' On='uninstall' />
+								<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesFolderKey" Root="HKCU" >
+									<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+								</RegistryKey>
+							</Component>
+							<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavacc" Name="javacc">
+								<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccFolder" Guid="1DA62621-434C-4A5F-BA39-BE308EC15E34" Win64="$(var.Win64)">
+									<CreateFolder />
+									<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavacc' On='uninstall' />
+									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccFolderKey" Root="HKCU" >
+										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+									</RegistryKey>
+								</Component>
+								<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccCom" Name="com">
+									<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolder" Guid="1887A161-87EF-4016-8D58-5DF5A4D0F6D7" Win64="$(var.Win64)">
 										<CreateFolder />
-										<RemoveFolder Id='SampleProjectJavaparserTarget' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetFolderKey" Root="HKCU" >
+										<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccCom' On='uninstall' />
+										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolderKey" Root="HKCU" >
 											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 										</RegistryKey>
 									</Component>
-									<Directory Id="SampleProjectJavaparserTargetGeneratedSources" Name="generated-sources">
-										<Component Id="SampleProjectJavaparserTargetGeneratedSourcesFolder" Guid="51670973-3944-4CB5-BE82-94BD2133FAF4">
+									<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub" Name="github">
+										<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolder" Guid="132C1BBA-D68C-4285-AEE1-86EEDFDD4389" Win64="$(var.Win64)">
 											<CreateFolder />
-											<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSources' On='uninstall' />
-											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesFolderKey" Root="HKCU" >
+											<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub' On='uninstall' />
+											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolderKey" Root="HKCU" >
 												<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 											</RegistryKey>
 										</Component>
-										<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavacc" Name="javacc">
-											<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccFolder" Guid="1DA62621-434C-4A5F-BA39-BE308EC15E34">
+										<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser" Name="javaparser">
+											<Component Id="SampleProjectJavaparserTargetGeneratedSourcesCode" Guid="2E9AEE68-666F-486B-86A9-F72860550A8F" Win64="$(var.Win64)">
 												<CreateFolder />
-												<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavacc' On='uninstall' />
-												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccFolderKey" Root="HKCU" >
+												<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser' On='uninstall' />
+												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGenerated-sourcesJavaccComGithubJavaparserCodeKey" Root="HKCU" >
 													<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 												</RegistryKey>
+												<File Id='ASTParserJava' Name='ASTParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java' KeyPath='no' />
+												<File Id='ASTParserConstantsJava' Name='ASTParserConstants.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java' KeyPath='no' />
+												<File Id='ASTParserTokenManagerJava' Name='ASTParserTokenManager.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java' KeyPath='no' />
+												<File Id='JavaCharStreamJava' Name='JavaCharStream.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java' KeyPath='no' />
+												<File Id='ParseExceptionJava' Name='ParseException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java' KeyPath='no' />
+												<File Id='ProviderJava' Name='Provider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java' KeyPath='no' />
+												<File Id='StreamProviderJava' Name='StreamProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java' KeyPath='no' />
+												<File Id='StringProviderJava' Name='StringProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java' KeyPath='no' />
+												<File Id='TokenJava' Name='Token.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java' KeyPath='no' />
+												<File Id='TokenMgrExceptionJava' Name='TokenMgrException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java' KeyPath='no' />
 											</Component>
-											<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccCom" Name="com">
-												<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolder" Guid="1887A161-87EF-4016-8D58-5DF5A4D0F6D7">
-													<CreateFolder />
-													<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccCom' On='uninstall' />
-													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolderKey" Root="HKCU" >
-														<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-													</RegistryKey>
-												</Component>
-												<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub" Name="github">
-													<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolder" Guid="132C1BBA-D68C-4285-AEE1-86EEDFDD4389">
-														<CreateFolder />
-														<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub' On='uninstall' />
-														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolderKey" Root="HKCU" >
-															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-														</RegistryKey>
-													</Component>
-													<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser" Name="javaparser">
-														<Component Id="SampleProjectJavaparserTargetGeneratedSourcesCode" Guid="2E9AEE68-666F-486B-86A9-F72860550A8F">
-															<CreateFolder />
-															<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser' On='uninstall' />
-															<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGenerated-sourcesJavaccComGithubJavaparserCodeKey" Root="HKCU" >
-																<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-															</RegistryKey>
-															<File Id='ASTParserJava' Name='ASTParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java' KeyPath='no' />
-															<File Id='ASTParserConstantsJava' Name='ASTParserConstants.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java' KeyPath='no' />
-															<File Id='ASTParserTokenManagerJava' Name='ASTParserTokenManager.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java' KeyPath='no' />
-															<File Id='JavaCharStreamJava' Name='JavaCharStream.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java' KeyPath='no' />
-															<File Id='ParseExceptionJava' Name='ParseException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java' KeyPath='no' />
-															<File Id='ProviderJava' Name='Provider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java' KeyPath='no' />
-															<File Id='StreamProviderJava' Name='StreamProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java' KeyPath='no' />
-															<File Id='StringProviderJava' Name='StringProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java' KeyPath='no' />
-															<File Id='TokenJava' Name='Token.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java' KeyPath='no' />
-															<File Id='TokenMgrExceptionJava' Name='TokenMgrException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java' KeyPath='no' />
-														</Component>
-													</Directory>
-												</Directory>
-											</Directory>
 										</Directory>
 									</Directory>
 								</Directory>
 							</Directory>
 						</Directory>
+					</Directory>
+				</Directory>
+			</Directory>
 		</DirectoryRef>
 	</Fragment>
 </Wix>
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/build.bat b/deployment/windows/wixSetup/build.bat
deleted file mode 100644
index d75bbfe1..00000000
--- a/deployment/windows/wixSetup/build.bat
+++ /dev/null
@@ -1,76 +0,0 @@
-VERSION_STRING=$(git describe --long)
-VERSION_STRING="${VERSION_STRING//-/_}"
-VERSION_STRING="${VERSION_STRING//./_}"
-VERSION_STRING="${VERSION_STRING%_*}"
-VERSION_STRING="${VERSION_STRING//_/.}"
-echo "installer version is $VERSION_STRING"
-
-PRODUCT_GUID=$(cmd.exe /c "VsDevCmd.bat & uuidgen")
-echo "product guid is $PRODUCT_GUID"
-
-rm -rf build
-mkdir build
-
-
-
-rm -rf ../../../bin/app/data/install/uninstall_wix.bat
-echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >../../../bin/app/data/install/uninstall_wix.bat
-
-
-"devenv.com" Setup/build/Setup.sln //build "Release|x86"
-"devenv.com" CustomActions/CustomActions.sln //build "Release|x86"
-
-rm -rf bin
-mkdir bin
-
-candle.exe -dprojectVersion="$VERSION_STRING" -dprojectGuid="$PRODUCT_GUID" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
-light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
-
-cp -u -r build/coati.msi bin
-cp -u -r build/Setup.exe bin
-
-cp -u -r lib/api-ms-win-core-console-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-datetime-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-debug-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-errorhandling-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-file-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-file-l1-2-0.dll bin
-cp -u -r lib/api-ms-win-core-file-l2-1-0.dll bin
-cp -u -r lib/api-ms-win-core-handle-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-heap-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-interlocked-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-libraryloader-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-localization-l1-2-0.dll bin
-cp -u -r lib/api-ms-win-core-memory-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-namedpipe-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-processenvironment-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-processthreads-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-processthreads-l1-1-1.dll bin
-cp -u -r lib/api-ms-win-core-profile-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-rtlsupport-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-string-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-synch-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-synch-l1-2-0.dll bin
-cp -u -r lib/api-ms-win-core-sysinfo-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-timezone-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-util-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-conio-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-convert-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-environment-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-filesystem-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-heap-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-locale-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-math-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-multibyte-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-private-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-process-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-runtime-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-stdio-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-string-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-time-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-utility-l1-1-0.dll bin
-cp -u -r lib/msvcp140.dll bin
-cp -u -r lib/ucrtbase.dll bin
-cp -u -r lib/vcruntime140.dll bin
-
-cp -u -r readme.txt bin
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/build.sh b/deployment/windows/wixSetup/build.sh
new file mode 100644
index 00000000..2032df71
--- /dev/null
+++ b/deployment/windows/wixSetup/build.sh
@@ -0,0 +1,41 @@
+WIN_ARCH=win32
+X_ARCH=x86
+
+if [ "$1" == "-win64" ]; then
+	WIN_ARCH=win64
+	X_ARCH=x64
+fi
+
+VERSION_STRING=$(git describe --long)
+VERSION_STRING="${VERSION_STRING//-/_}"
+VERSION_STRING="${VERSION_STRING//./_}"
+VERSION_STRING="${VERSION_STRING%_*}"
+VERSION_STRING="${VERSION_STRING//_/.}"
+echo "installer version is $VERSION_STRING"
+
+PRODUCT_GUID=$(cmd.exe /c "VsDevCmd.bat & uuidgen")
+echo "$WIN_ARCH product guid is $PRODUCT_GUID"
+
+rm -rf build
+mkdir build
+
+
+rm -rf ../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
+echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
+
+
+"devenv.com" Setup/build/Setup.sln //build "Release|$X_ARCH"
+"devenv.com" CustomActions/CustomActions.sln //build "Release|$X_ARCH"
+
+OUTPUT_DIR=bin/$WIN_ARCH
+
+rm -rf $OUTPUT_DIR
+mkdir $OUTPUT_DIR
+
+candle.exe -dProductVersion="$VERSION_STRING" -dProductGuid="$PRODUCT_GUID" -arch $X_ARCH coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
+light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
+
+cp -u -r build/coati.msi $OUTPUT_DIR
+cp -u -r build/Setup.exe $OUTPUT_DIR
+cp -u -r lib/$WIN_ARCH/* $OUTPUT_DIR
+cp -u -r readme.txt $OUTPUT_DIR
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/build_win32.sh b/deployment/windows/wixSetup/build_win32.sh
new file mode 100644
index 00000000..8983f1cc
--- /dev/null
+++ b/deployment/windows/wixSetup/build_win32.sh
@@ -0,0 +1 @@
+build.sh -win32
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/build_win64.sh b/deployment/windows/wixSetup/build_win64.sh
new file mode 100644
index 00000000..76919e07
--- /dev/null
+++ b/deployment/windows/wixSetup/build_win64.sh
@@ -0,0 +1 @@
+build.sh -win64
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs
index a13dfff0..f7b13e36 100644
--- a/deployment/windows/wixSetup/coati.wxs
+++ b/deployment/windows/wixSetup/coati.wxs
@@ -1,32 +1,56 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
-    <Product Name='Coati' 
-			Manufacturer='Coati Software OG'
-			Id='$(var.projectGuid)'
-			UpgradeCode='6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF'
-			Language='1033' 
-			Codepage='1252'
-			Version='$(var.projectVersion)'>
+<?define ProductName = "Coati" ?>
+<?define ProductAuthor = "Coati Software OG" ?>
+<?define ProductAppFolder = "InstallLocation" ?>
+	 
+<?if $(sys.BUILDARCH) = x64 ?>
+	<?define ProductDisplayName = "$(var.ProductName) 64-bit" ?>
+	<?define ProductUpgradeCode = "693A35C7-8D56-4930-8653-1DC880D78678" ?>
+	<?define Win64 = "yes" ?>
+	<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+<?else ?>
+	<?define ProductDisplayName = "$(var.ProductName)" ?>
+	<?define ProductUpgradeCode = "6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF" ?>
+	<?define Win64 = "no" ?>
+	<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+<?endif ?>
 
-		<Package Id='*' Keywords='Installer' Description="Coati Installer"
-			Comments='Coati is a registered trademark of Coati Software OG' Manufacturer='Coati Software OG'
-			InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+    <Product 
+		Name='$(var.ProductDisplayName)' 
+		Manufacturer='$(var.ProductAuthor)'
+		Id='$(var.ProductGuid)'
+		UpgradeCode='$(var.ProductUpgradeCode)'
+		Language='1033' 
+		Codepage='1252'
+		Version='$(var.ProductVersion)'>
+
+		<Package 
+			Id='*' 
+			Keywords='Installer' 
+			Description="$(var.ProductDisplayName) Installer"
+			Comments='$(var.ProductName) is a registered trademark of $(var.ProductAuthor)' 
+			Manufacturer='$(var.ProductAuthor)'
+			InstallerVersion='100' 
+			Languages='1033' 
+			Compressed='yes' 
+			SummaryCodepage='1252' />
 
 		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
 
-		<Property Id='DiskPrompt' Value="Coati Installation [1]" />
+		<Property Id='DiskPrompt' Value="$(var.ProductDisplayName) Installation [1]" />
 		<Property Id="INSTALLDESKTOPSHORTCUT" />
 		<Property Id="INSTALLSTARTMENUSHORTCUT" Value="true" />
 
 		<!-- Shortcuts -->
-		<Upgrade Id='6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF'>
+		<Upgrade Id='$(var.ProductUpgradeCode)'>
 			<UpgradeVersion Property="REMOVINGTHEOLDVERSION" Minimum="0.0.0"    RemoveFeatures="ALL" />
 			<UpgradeVersion OnlyDetect='yes' Property='SELFFOUND'
-				Minimum='$(var.projectVersion)' IncludeMinimum='yes'
-				Maximum='$(var.projectVersion)' IncludeMaximum='yes' />
+				Minimum='$(var.ProductVersion)' IncludeMinimum='yes'
+				Maximum='$(var.ProductVersion)' IncludeMaximum='yes' />
 			<UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND'
-				Minimum='$(var.projectVersion)' IncludeMinimum='no' />
+				Minimum='$(var.ProductVersion)' IncludeMinimum='no' />
 		</Upgrade>
 
 		<Directory Id='TARGETDIR' Name='SourceDir'>
@@ -34,30 +58,31 @@
 			<!-- This would be an alternative to include C++ runtime stuff, currently the required DLLs are included directly instead -->
 			<!-- <Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x86.msm" DiskId="1" Language="0"/> -->
 
+			<!-- Start menu (shortcuts) -->
 			<Directory Id="ProgramMenuFolder" Name="Programs">
-				<Directory Id="ProgramMenuDir" Name="Coati">
-					<Component Id="UninstallShortcut" Guid="028B666E-FAE8-4F53-A0E6-C2E0396CB6F2">
+				<Directory Id="ProgramMenuDir" Name="$(var.ProductDisplayName)">
+					<Component Id="UninstallShortcut" Guid="028B666E-FAE8-4F53-A0E6-C2E0396CB6F2" Win64="$(var.Win64)">
 						<Condition>INSTALLSTARTMENUSHORTCUT</Condition>
 						<!-- <Shortcut Id="UninstallProduct"
-									Name="Coati Uninstall"
-									Description="Uninstall Coati"
+									Name="$(var.ProductDisplayName) Uninstall"
+									Description="Uninstall $(var.ProductDisplayName)"
 									Target="[System64Folder]msiexec.exe"
 									Arguments="/x [ProductCode]"/> -->
 
 						<Shortcut Id="UninstallProduct"
-								Name="Uninstall Coati"
-								Description="Remove Coati from your computer"
+								Name="Uninstall $(var.ProductDisplayName)"
+								Description="Remove $(var.ProductDisplayName) from your computer"
 								Target="[INSTALLDIR]uninstall.bat" />
 
 						<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]\CoatiUninstall" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
 						<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
 					</Component>
 
-					<Component Id="ApplicationShortcut" Guid="5AD30B21-61BA-4002-AF2F-E9E69989E446">
+					<Component Id="ApplicationShortcut" Guid="5AD30B21-61BA-4002-AF2F-E9E69989E446" Win64="$(var.Win64)">
 						<Condition>INSTALLSTARTMENUSHORTCUT</Condition>
 						<Shortcut Id="ApplicationStartMenuShortcut"
 
-									Name="Coati"
+									Name="$(var.ProductDisplayName)"
 									Description="The Source Explorer"
 									Target="[INSTALLDIR]Coati.exe"
 									WorkingDirectory="INSTALLDIR"/>
@@ -66,12 +91,12 @@
 				</Directory>
 			</Directory>
 
-
+			<!-- Desktop menu (shortcuts) -->
 			<Directory Id="DesktopFolder" Name="Desktop">
-				<Component Id='DesktopShortcut' Guid='285FA7FC-F355-4892-AFA7-DD49B8D81563'>
+				<Component Id='DesktopShortcut' Guid='285FA7FC-F355-4892-AFA7-DD49B8D81563' Win64="$(var.Win64)">
 					<Condition>INSTALLDESKTOPSHORTCUT</Condition>
 					<Shortcut Id="ApplicationDesktopShortcut"
-								Name="Coati"
+								Name="$(var.ProductDisplayName)"
 								Description="Source Explorer"
 								Target="[INSTALLDIR]Coati.exe"
 								WorkingDirectory="INSTALLDIR"/>
@@ -81,7 +106,7 @@
 			</Directory>
 
 			<!-- Application Folder -->
-			<Directory Id='ProgramFilesFolder' Name='PFiles'>
+			<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
 				<Directory Id='COMPANYDIR' Name='Coati Software'>
 					<Directory Id='INSTALLDIR' Name='Coati' />
 				</Directory>
@@ -92,7 +117,7 @@
 			<Directory Id="LocalAppDataFolder">
 				<Directory Id="CoatiSoftwareAppData" Name="Coati Software">
 
-					<Component Id="CoatiSoftwareAppDataDummy" Guid="E57CFAEC-B3E7-45EB-8B94-F50EBDA1355C">
+					<Component Id="CoatiSoftwareAppDataDummy" Guid="E57CFAEC-B3E7-45EB-8B94-F50EBDA1355C" Win64="$(var.Win64)">
 						<CreateFolder />
 						<RemoveFolder Id='CoatiSoftwareAppData' On='uninstall' />
 						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\coatiSoftwareAppData" Root="HKCU" >
@@ -100,8 +125,8 @@
 						</RegistryKey>
 					</Component>
 
-					<Directory Id="CoatiAppData" Name="Coati">
-						<Component Id="CoatiAppDataDummy" Guid="93024EB9-ED47-4D0D-B790-1028E10F8015">
+					<Directory Id="CoatiAppData" Name="$(var.ProductDisplayName)">
+						<Component Id="CoatiAppDataDummy" Guid="93024EB9-ED47-4D0D-B790-1028E10F8015" Win64="$(var.Win64)">
 						<CreateFolder />
 						<RemoveFolder Id='CoatiAppData' On='uninstall' />
 						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\coatiAppData" Root="HKCU" >
@@ -115,7 +140,7 @@
 
 
 
-		<Feature Id='Complete' Title='Coati' Description='Source Explorer' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
+		<Feature Id='Complete' Title='$(var.ProductDisplayName)' Description='Source Explorer' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
 			<Feature Id='Program' Title='Program' Description='The main installation' Level='1'>
 				<!-- Prerequisites -->
 				<!-- <MergeRef Id='VCRedist'/> --> <!-- see comment at declaration -->
@@ -190,14 +215,18 @@
 				<ComponentRef Id='LogoFhsPng'/>
 
 				<ComponentRef Id='CodeViewCss'/>
-				<ComponentRef Id='EditPng'/>
-				<ComponentRef Id='MaximizeActivePng'/>
-				<ComponentRef Id='MaximizeInactivePng'/>
-				<ComponentRef Id='MinimizeActivePng'/>
-				<ComponentRef Id='MinimizeInactivePng'/>
-				<ComponentRef Id='PatternPng'/>
-				<ComponentRef Id='SnippetActivePng'/>
-				<ComponentRef Id='SnippetInactivePng'/>
+				<ComponentRef Id='CodeViewArrowLeftPng'/>
+				<ComponentRef Id='CodeViewArrowRightPng'/>
+				<ComponentRef Id='CodeViewEditPng'/>
+				<ComponentRef Id='CodeViewFilePng'/>
+				<ComponentRef Id='CodeViewListPng'/>
+				<ComponentRef Id='CodeViewMaximizeActivePng'/>
+				<ComponentRef Id='CodeViewMaximizeInactivePng'/>
+				<ComponentRef Id='CodeViewMinimizeActivePng'/>
+				<ComponentRef Id='CodeViewMinimizeInactivePng'/>
+				<ComponentRef Id='CodeViewPatternPng'/>
+				<ComponentRef Id='CodeViewSnippetActivePng'/>
+				<ComponentRef Id='CodeViewSnippetInactivePng'/>
 				
 				<ComponentRef Id='ErrorViewCss'/>
 
@@ -214,6 +243,8 @@
 				<ComponentRef Id='PublicPng'/>
 				<ComponentRef Id='TemplatePng'/>
 				<ComponentRef Id='TypedefPng'/>
+				<ComponentRef Id='ZoomInPng'/>
+				<ComponentRef Id='ZoomOutPng'/>
 
 				<ComponentRef Id='C_icon_Png'/>
 				<ComponentRef Id='Cdb_icon_Png'/>
@@ -357,7 +388,5 @@
 
 		<WixVariable Id="WixUIBannerBmp" Value="Images/banner.bmp" />
 		<WixVariable Id="WixUIDialogBmp" Value="Images/w_installer.bmp" />
-
-		<!-- <WixVariable Id="var.Coati.projectVersion" Value="0.7.0" /> -->
 	</Product>
 </Wix>
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index 052f8b61..bf72e92a 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -1,10 +1,19 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+	<?if $(sys.BUILDARCH) = x64 ?>
+		<?define PlatformSourceFolder = "./../../../build/win64/Release/app" ?>
+		<?define Win64 = "yes" ?>
+	<?else ?>
+		<?define PlatformSourceFolder = "./../../../build/win32/Release/app" ?>
+		<?define Win64 = "no" ?>
+	<?endif ?>
+	
 	<Fragment>
 		<DirectoryRef Id='INSTALLDIR'>
 
-			<Component Id='MainExecutable' Guid='A6136907-B3C5-4393-88D7-2ACF63E138A8'>
-				<File Id='CoatiEXE' Name='Coati.exe' DiskId='1' Source='./../../../bin/app/Release/Coati_obfuscated.exe' KeyPath='yes' />
+			<Component Id='MainExecutable' Guid='A6136907-B3C5-4393-88D7-2ACF63E138A8' Win64="$(var.Win64)">
+				<File Id='CoatiEXE' Name='Coati.exe' DiskId='1' Source='$(var.PlatformSourceFolder)/Coati_obfuscated.exe' KeyPath='yes' />
 
 				<!-- File association -->
 				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\[ProductName].Document" Name="projectfile" Value="Coati project file" Type="string" />
@@ -17,202 +26,202 @@
 
 			</Component>
 
-			<Component Id='Qt5CoreDll' Guid='0C899A49-DE40-4D35-A0E9-9B64E330BCFA'>
-				<File Id='qt5coreDLL' Name='Qt5Core.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Core.dll' KeyPath='yes' />
+			<Component Id='Qt5CoreDll' Guid='0C899A49-DE40-4D35-A0E9-9B64E330BCFA' Win64="$(var.Win64)">
+				<File Id='qt5coreDLL' Name='Qt5Core.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Core.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='Qt5GuiDll' Guid='F57A8F21-7420-49BC-98B9-2ECD3C5B9674'>
-				<File Id='qt5guiDLL' Name='Qt5Gui.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Gui.dll' KeyPath='yes' />
+			<Component Id='Qt5GuiDll' Guid='F57A8F21-7420-49BC-98B9-2ECD3C5B9674' Win64="$(var.Win64)">
+				<File Id='qt5guiDLL' Name='Qt5Gui.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Gui.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='Qt5NetworkDll' Guid='78E8699E-42EA-48BD-B844-DD0F9C0ED432'>
-				<File Id='qt5networkDLL' Name='Qt5Network.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Network.dll' KeyPath='yes' />
+			<Component Id='Qt5NetworkDll' Guid='78E8699E-42EA-48BD-B844-DD0F9C0ED432' Win64="$(var.Win64)">
+				<File Id='qt5networkDLL' Name='Qt5Network.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Network.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='Qt5WidgetsDll' Guid='462F10F3-6AC7-473C-95EA-C5616E2822A3'>
-				<File Id='qt5widgetsDLL' Name='Qt5Widgets.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Widgets.dll' KeyPath='yes' />
+			<Component Id='Qt5WidgetsDll' Guid='462F10F3-6AC7-473C-95EA-C5616E2822A3' Win64="$(var.Win64)">
+				<File Id='qt5widgetsDLL' Name='Qt5Widgets.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Widgets.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreConsole_l1_1_0Dll' Guid='D35F6AA1-972E-4DFE-9899-F0202B193F15'>
-				<File Id='apiMsWinCoreConsole_l1_1_0' Name='api-ms-win-core-console-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-console-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreConsole_l1_1_0Dll' Guid='D35F6AA1-972E-4DFE-9899-F0202B193F15' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreConsole_l1_1_0' Name='api-ms-win-core-console-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-console-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreDatetime_l1_1_0Dll' Guid='2A3EE573-DD09-4A0A-B1F1-F0B0B97CF602'>
-				<File Id='apiMsWinCoreDatetime_l1_1_0' Name='api-ms-win-core-datetime-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-datetime-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreDatetime_l1_1_0Dll' Guid='2A3EE573-DD09-4A0A-B1F1-F0B0B97CF602' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreDatetime_l1_1_0' Name='api-ms-win-core-datetime-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-datetime-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreDebug_l1_1_0Dll' Guid='DCCF0C00-0FC0-4106-BCF8-58ED2853DA6A'>
-				<File Id='apiMsWinCoreDebug_l1_1_0' Name='api-ms-win-core-debug-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-debug-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreDebug_l1_1_0Dll' Guid='DCCF0C00-0FC0-4106-BCF8-58ED2853DA6A' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreDebug_l1_1_0' Name='api-ms-win-core-debug-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-debug-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreErrorhandling_l1_1_0Dll' Guid='0B7D5180-15DA-4183-B0CF-CFE150AC8DE7'>
-				<File Id='apiMsWinCoreErrorhandling_l1_1_0' Name='api-ms-win-core-errorhandling-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreErrorhandling_l1_1_0Dll' Guid='0B7D5180-15DA-4183-B0CF-CFE150AC8DE7' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreErrorhandling_l1_1_0' Name='api-ms-win-core-errorhandling-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-errorhandling-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreFile_l1_1_0Dll' Guid='00BF3FDD-3407-4CEA-B0A9-930C44867156'>
-				<File Id='apiMsWinCoreFile_l1_1_0' Name='api-ms-win-core-file-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-file-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreFile_l1_1_0Dll' Guid='00BF3FDD-3407-4CEA-B0A9-930C44867156' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreFile_l1_1_0' Name='api-ms-win-core-file-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-file-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreFile_l1_2_0Dll' Guid='9BE43140-A1E2-433C-A996-8CDCE5AF796F'>
-				<File Id='apiMsWinCoreFile_l1_2_0' Name='api-ms-win-core-file-l1-2-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-file-l1-2-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreFile_l1_2_0Dll' Guid='9BE43140-A1E2-433C-A996-8CDCE5AF796F' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreFile_l1_2_0' Name='api-ms-win-core-file-l1-2-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-file-l1-2-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreFile_l2_1_0Dll' Guid='8852AA5A-DB7B-424B-9664-D67E427954A7'>
-				<File Id='apiMsWinCoreFile_l2_1_0' Name='api-ms-win-core-file-l2-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-file-l2-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreFile_l2_1_0Dll' Guid='8852AA5A-DB7B-424B-9664-D67E427954A7' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreFile_l2_1_0' Name='api-ms-win-core-file-l2-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-file-l2-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreHandle_l1_1_0Dll' Guid='F497FCD9-D69C-474D-B615-073843230620'>
-				<File Id='apiMsWinCoreHandle_l1_1_0' Name='api-ms-win-core-handle-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-handle-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreHandle_l1_1_0Dll' Guid='F497FCD9-D69C-474D-B615-073843230620' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreHandle_l1_1_0' Name='api-ms-win-core-handle-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-handle-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreHeap_l1_1_0Dll' Guid='AF6A4D45-F28B-43B6-B679-860FA43D9062'>
-				<File Id='apiMsWinCoreHeap_l1_1_0' Name='api-ms-win-core-heap-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-heap-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreHeap_l1_1_0Dll' Guid='AF6A4D45-F28B-43B6-B679-860FA43D9062' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreHeap_l1_1_0' Name='api-ms-win-core-heap-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-heap-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreInterlocked_l1_1_0Dll' Guid='9C25B5AC-7010-47DA-A478-FDBC5806BB61'>
-				<File Id='apiMsWinCoreInterlocked_l1_1_0' Name='api-ms-win-core-interlocked-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-interlocked-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreInterlocked_l1_1_0Dll' Guid='9C25B5AC-7010-47DA-A478-FDBC5806BB61' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreInterlocked_l1_1_0' Name='api-ms-win-core-interlocked-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-interlocked-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreLibraryloader_l1_1_0Dll' Guid='FBA31F5E-7376-4BA9-A4AB-BF6B3CE3F813'>
-				<File Id='apiMsWinCoreLibraryloader_l1_1_0' Name='api-ms-win-core-libraryloader-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreLibraryloader_l1_1_0Dll' Guid='FBA31F5E-7376-4BA9-A4AB-BF6B3CE3F813' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreLibraryloader_l1_1_0' Name='api-ms-win-core-libraryloader-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-libraryloader-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreLocalization_l1_2_0Dll' Guid='C8B8637B-1740-472D-87C6-597200241142'>
-				<File Id='apiMsWinCoreLocalization_l1_2_0' Name='api-ms-win-core-localization-l1-2-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-localization-l1-2-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreLocalization_l1_2_0Dll' Guid='C8B8637B-1740-472D-87C6-597200241142' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreLocalization_l1_2_0' Name='api-ms-win-core-localization-l1-2-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-localization-l1-2-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreMemory_l1_1_0Dll' Guid='6A18F471-DD94-41C7-912D-3BFDB73DC4CF'>
-				<File Id='apiMsWinCoreMemory_l1_1_0' Name='api-ms-win-core-memory-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-memory-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreMemory_l1_1_0Dll' Guid='6A18F471-DD94-41C7-912D-3BFDB73DC4CF' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreMemory_l1_1_0' Name='api-ms-win-core-memory-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-memory-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreNamedpipe_l1_1_0Dll' Guid='4BF8D691-7A6D-41BD-ACAA-04C4B991A54F'>
-				<File Id='apiMsWinCoreNamedpipe_l1_1_0' Name='api-ms-win-core-namedpipe-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreNamedpipe_l1_1_0Dll' Guid='4BF8D691-7A6D-41BD-ACAA-04C4B991A54F' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreNamedpipe_l1_1_0' Name='api-ms-win-core-namedpipe-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-namedpipe-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProcessEnvironment_l1_1_0Dll' Guid='B20746F9-0249-4A09-ACD1-BAE0B9B88B66'>
-				<File Id='apiMsWinCoreProcessEnvironment_l1_1_0' Name='api-ms-win-core-processenvironment-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProcessEnvironment_l1_1_0Dll' Guid='B20746F9-0249-4A09-ACD1-BAE0B9B88B66' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProcessEnvironment_l1_1_0' Name='api-ms-win-core-processenvironment-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-processenvironment-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProcessThreads_l1_1_0Dll' Guid='E5AC282B-1450-4153-B87A-66D2D18AE559'>
-				<File Id='apiMsWinCoreProcessThreads_l1_1_0' Name='api-ms-win-core-processthreads-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-processthreads-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProcessThreads_l1_1_0Dll' Guid='E5AC282B-1450-4153-B87A-66D2D18AE559' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProcessThreads_l1_1_0' Name='api-ms-win-core-processthreads-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-processthreads-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProcessThreads_l1_1_1Dll' Guid='F52291C2-A879-48DA-8792-6412A40095C4'>
-				<File Id='apiMsWinCoreProcessThreads_l1_1_1' Name='api-ms-win-core-processthreads-l1-1-1.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-processthreads-l1-1-1.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProcessThreads_l1_1_1Dll' Guid='F52291C2-A879-48DA-8792-6412A40095C4' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProcessThreads_l1_1_1' Name='api-ms-win-core-processthreads-l1-1-1.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-processthreads-l1-1-1.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProfile_l1_1_0Dll' Guid='9B8ABBC6-AEC8-4BD9-96E9-F3E88EDF089E'>
-				<File Id='apiMsWinCoreProfile_l1_1_0' Name='api-ms-win-core-profile-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-profile-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProfile_l1_1_0Dll' Guid='9B8ABBC6-AEC8-4BD9-96E9-F3E88EDF089E' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProfile_l1_1_0' Name='api-ms-win-core-profile-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-profile-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreRtlSupport_l1_1_0Dll' Guid='81B8E33F-B8D4-4AFC-9171-1D16F3FA9855'>
-				<File Id='apiMsWinCoreRtlSupport_l1_1_0' Name='api-ms-win-core-rtlsupport-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreRtlSupport_l1_1_0Dll' Guid='81B8E33F-B8D4-4AFC-9171-1D16F3FA9855' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreRtlSupport_l1_1_0' Name='api-ms-win-core-rtlsupport-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-rtlsupport-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreString_l1_1_0Dll' Guid='773CA407-1BB6-49D2-8369-39A231A0D815'>
-				<File Id='apiMsWinCoreString_l1_1_0' Name='api-ms-win-core-string-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-string-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreString_l1_1_0Dll' Guid='773CA407-1BB6-49D2-8369-39A231A0D815' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreString_l1_1_0' Name='api-ms-win-core-string-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-string-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreSynch_l1_1_0Dll' Guid='1FACD574-AC3B-41FC-8689-536B6F96FDBE'>
-				<File Id='apiMsWinCoreSynch_l1_1_0' Name='api-ms-win-core-synch-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-synch-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreSynch_l1_1_0Dll' Guid='1FACD574-AC3B-41FC-8689-536B6F96FDBE' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreSynch_l1_1_0' Name='api-ms-win-core-synch-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-synch-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreSynch_l1_2_0Dll' Guid='43160A12-6CF8-48F9-AB96-3BB305321BE9'>
-				<File Id='apiMsWinCoreSynch_l1_2_0' Name='api-ms-win-core-synch-l1-2-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-synch-l1-2-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreSynch_l1_2_0Dll' Guid='43160A12-6CF8-48F9-AB96-3BB305321BE9' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreSynch_l1_2_0' Name='api-ms-win-core-synch-l1-2-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-synch-l1-2-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreSysInfo_l1_1_0Dll' Guid='272EB183-CA7F-4BC0-BA86-1497AD55F085'>
-				<File Id='apiMsWinCoreSysInfo_l1_1_0' Name='api-ms-win-core-sysinfo-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreSysInfo_l1_1_0Dll' Guid='272EB183-CA7F-4BC0-BA86-1497AD55F085' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreSysInfo_l1_1_0' Name='api-ms-win-core-sysinfo-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-sysinfo-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreTimezone_l1_1_0Dll' Guid='E9DF7695-E203-4CD3-AB80-DD2264C66A9C'>
-				<File Id='apiMsWinCoreTimezone_l1_1_0' Name='api-ms-win-core-timezone-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-timezone-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreTimezone_l1_1_0Dll' Guid='E9DF7695-E203-4CD3-AB80-DD2264C66A9C' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreTimezone_l1_1_0' Name='api-ms-win-core-timezone-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-timezone-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreUtil_l1_1_0Dll' Guid='B428A873-4334-4139-81F7-3F8EF93DC2EB'>
-				<File Id='apiMsWinCoreUtil_l1_1_0' Name='api-ms-win-core-util-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-util-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreUtil_l1_1_0Dll' Guid='B428A873-4334-4139-81F7-3F8EF93DC2EB' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreUtil_l1_1_0' Name='api-ms-win-core-util-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-util-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtConio_l1_1_0Dll' Guid='3B293AB9-6832-4269-B3C9-3B9D1A0FDAEB'>
-				<File Id='apiMsWinCrtConio_l1_1_0' Name='api-ms-win-crt-conio-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-conio-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtConio_l1_1_0Dll' Guid='3B293AB9-6832-4269-B3C9-3B9D1A0FDAEB' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtConio_l1_1_0' Name='api-ms-win-crt-conio-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-conio-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtConvert_l1_1_0Dll' Guid='312F3060-33EB-47C7-8BAD-ED9C25DCC522'>
-				<File Id='apiMsWinCrtConvert_l1_1_0' Name='api-ms-win-crt-convert-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-convert-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtConvert_l1_1_0Dll' Guid='312F3060-33EB-47C7-8BAD-ED9C25DCC522' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtConvert_l1_1_0' Name='api-ms-win-crt-convert-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-convert-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtEnvironment_l1_1_0Dll' Guid='C495A75E-6273-4733-AB72-C8D1AE2FDBF6'>
-				<File Id='apiMsWinCrtEnvironment_l1_1_0' Name='api-ms-win-crt-environment-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-environment-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtEnvironment_l1_1_0Dll' Guid='C495A75E-6273-4733-AB72-C8D1AE2FDBF6' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtEnvironment_l1_1_0' Name='api-ms-win-crt-environment-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-environment-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtFilesystem_l1_1_0Dll' Guid='29214B8C-B655-486E-804C-E8018C073B2A'>
-				<File Id='apiMsWinCrtFilesystem_l1_1_0' Name='api-ms-win-crt-filesystem-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtFilesystem_l1_1_0Dll' Guid='29214B8C-B655-486E-804C-E8018C073B2A' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtFilesystem_l1_1_0' Name='api-ms-win-crt-filesystem-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-filesystem-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtHeap_l1_1_0Dll' Guid='EA2516C4-5E0B-41EA-A95E-14874166EE7E'>
-				<File Id='apiMsWinCrtHeap_l1_1_0' Name='api-ms-win-crt-heap-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-heap-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtHeap_l1_1_0Dll' Guid='EA2516C4-5E0B-41EA-A95E-14874166EE7E' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtHeap_l1_1_0' Name='api-ms-win-crt-heap-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-heap-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtLocale_l1_1_0Dll' Guid='D3215D0B-B9DB-48A1-B93D-558ADBF9CEFD'>
-				<File Id='apiMsWinCrtLocale_l1_1_0' Name='api-ms-win-crt-locale-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-locale-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtLocale_l1_1_0Dll' Guid='D3215D0B-B9DB-48A1-B93D-558ADBF9CEFD' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtLocale_l1_1_0' Name='api-ms-win-crt-locale-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-locale-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtMath_l1_1_0Dll' Guid='115C6C2B-54DA-4F2A-986F-4E58043DE1F8'>
-				<File Id='apiMsWinCrtMath_l1_1_0' Name='api-ms-win-crt-math-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-math-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtMath_l1_1_0Dll' Guid='115C6C2B-54DA-4F2A-986F-4E58043DE1F8' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtMath_l1_1_0' Name='api-ms-win-crt-math-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-math-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtMultibyte_l1_1_0Dll' Guid='95BD7652-C8C1-4C6F-8F58-AF4F16B8A7B9'>
-				<File Id='apiMsWinCrtMultibyte_l1_1_0' Name='api-ms-win-crt-multibyte-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtMultibyte_l1_1_0Dll' Guid='95BD7652-C8C1-4C6F-8F58-AF4F16B8A7B9' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtMultibyte_l1_1_0' Name='api-ms-win-crt-multibyte-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-multibyte-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtPrivate_l1_1_0Dll' Guid='194FDBBA-C1CC-492B-88D6-D9B962FF9BB3'>
-				<File Id='apiMsWinCrtPrivate_l1_1_0' Name='api-ms-win-crt-private-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-private-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtPrivate_l1_1_0Dll' Guid='194FDBBA-C1CC-492B-88D6-D9B962FF9BB3' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtPrivate_l1_1_0' Name='api-ms-win-crt-private-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-private-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtProcess_l1_1_0Dll' Guid='C2E2912D-96FB-42B7-9156-685079F95A8E'>
-				<File Id='apiMsWinCrtProcess_l1_1_0' Name='api-ms-win-crt-process-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-process-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtProcess_l1_1_0Dll' Guid='C2E2912D-96FB-42B7-9156-685079F95A8E' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtProcess_l1_1_0' Name='api-ms-win-crt-process-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-process-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtRuntime_l1_1_0Dll' Guid='2298D4BF-C6E3-453B-A756-3056AE13DCE0'>
-				<File Id='apiMsWinCrtRuntime_l1_1_0' Name='api-ms-win-crt-runtime-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-runtime-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtRuntime_l1_1_0Dll' Guid='2298D4BF-C6E3-453B-A756-3056AE13DCE0' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtRuntime_l1_1_0' Name='api-ms-win-crt-runtime-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-runtime-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtStdio_l1_1_0Dll' Guid='CD274BB1-ECC5-4AED-83C9-D9DA8F3FFCF4'>
-				<File Id='apiMsWinCrtStdio_l1_1_0' Name='api-ms-win-crt-stdio-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-stdio-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtStdio_l1_1_0Dll' Guid='CD274BB1-ECC5-4AED-83C9-D9DA8F3FFCF4' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtStdio_l1_1_0' Name='api-ms-win-crt-stdio-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-stdio-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtString_l1_1_0Dll' Guid='C555A09F-DCBF-401E-8420-0AAE88C4C96F'>
-				<File Id='apiMsWinCrtString_l1_1_0' Name='api-ms-win-crt-string-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-string-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtString_l1_1_0Dll' Guid='C555A09F-DCBF-401E-8420-0AAE88C4C96F' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtString_l1_1_0' Name='api-ms-win-crt-string-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-string-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtTime_l1_1_0Dll' Guid='8002F662-4214-453D-907F-113909019557'>
-				<File Id='apiMsWinCrtTime_l1_1_0' Name='api-ms-win-crt-time-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-time-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtTime_l1_1_0Dll' Guid='8002F662-4214-453D-907F-113909019557' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtTime_l1_1_0' Name='api-ms-win-crt-time-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-time-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtUtility_l1_1_0Dll' Guid='56BCC0B1-2664-414A-AC29-DEE39CEAA845'>
-				<File Id='apiMsWinCrtUtility_l1_1_0' Name='api-ms-win-crt-utility-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-utility-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtUtility_l1_1_0Dll' Guid='56BCC0B1-2664-414A-AC29-DEE39CEAA845' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtUtility_l1_1_0' Name='api-ms-win-crt-utility-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-utility-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='ucrtbaseDll' Guid='83DABDC8-59D6-4D59-9FC1-F0C093BF5908'>
-				<File Id='ucrtbase' Name='ucrtbase.dll' DiskId='1' Source='./../../../bin/app/Release/ucrtbase.dll' KeyPath='yes' />
+			<Component Id='ucrtbaseDll' Guid='83DABDC8-59D6-4D59-9FC1-F0C093BF5908' Win64="$(var.Win64)">
+				<File Id='ucrtbase' Name='ucrtbase.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/ucrtbase.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='qtConf' Guid='58C34A47-0F21-4C41-9CCC-08141D84FF2A'>
-				<File Id='qt' Name='qt.conf' DiskId='1' Source='./../../../bin/app/Release/qt.conf' KeyPath='yes' />
+			<Component Id='qtConf' Guid='58C34A47-0F21-4C41-9CCC-08141D84FF2A' Win64="$(var.Win64)">
+				<File Id='qt' Name='qt.conf' DiskId='1' Source='$(var.PlatformSourceFolder)/qt.conf' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='msvcp140_dll' Guid='C15EC0AA-0BD3-4AF2-83D2-890815B6D473'>
-				<File Id='msvcp140' Name='msvcp140.dll' DiskId='1' Source='./../../../bin/app/Release/msvcp140.dll' KeyPath='yes' />
+			<Component Id='msvcp140_dll' Guid='C15EC0AA-0BD3-4AF2-83D2-890815B6D473' Win64="$(var.Win64)">
+				<File Id='msvcp140' Name='msvcp140.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/msvcp140.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='vcruntime140_dll' Guid='6487E9EE-A0D5-4BDC-89B5-767EAACDD10E'>
-				<File Id='vcruntime140' Name='vcruntime140.dll' DiskId='1' Source='./../../../bin/app/Release/vcruntime140.dll' KeyPath='yes' />
+			<Component Id='vcruntime140_dll' Guid='6487E9EE-A0D5-4BDC-89B5-767EAACDD10E' Win64="$(var.Win64)">
+				<File Id='vcruntime140' Name='vcruntime140.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/vcruntime140.dll' KeyPath='yes' />
 			</Component>
 			
 			<Directory Id='Platforms' Name='platforms'>
 
-				<Component Id='QWindowsDll' Guid='0B57B111-1068-42D1-891B-A21C6C0CC63E'>
-					<File Id='qwindowsDLL' Name='qwindows.dll' DiskId='1' Source='./../../../bin/app/Release/platforms/qwindows.dll' KeyPath='yes' />
+				<Component Id='QWindowsDll' Guid='0B57B111-1068-42D1-891B-A21C6C0CC63E' Win64="$(var.Win64)">
+					<File Id='qwindowsDLL' Name='qwindows.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/platforms/qwindows.dll' KeyPath='yes' />
 				</Component>
 
 			</Directory>
@@ -221,7 +230,7 @@
 
 				<Directory Id='DataFonts' Name='fonts'>
 
-					<Component Id='FontSet' Guid='F5330EDB-A1E2-4B1D-BBA3-A65DAFE34814'>
+					<Component Id='FontSet' Guid='F5330EDB-A1E2-4B1D-BBA3-A65DAFE34814' Win64="$(var.Win64)">
 						<File Id='FiraSansLicensetxt' Name='FiraSans_License.txt' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans_License.txt' KeyPath='yes' />
 						<File Id='FiraSansRegularotf' Name='FiraSans-Regular.otf' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans-Regular.otf' KeyPath='no' />
 						<File Id='FiraSansSemiBoldotf' Name='FiraSans-SemiBold.otf' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans-SemiBold.otf' KeyPath='no' />
@@ -239,7 +248,7 @@
 				</Directory>
 
 				<Directory Id='DataColorSchemes' Name='color_schemes'>
-					<Component Id='ColorSchemes' Guid='D6F2E227-6442-4415-B2F6-050E2A142D09'>
+					<Component Id='ColorSchemes' Guid='D6F2E227-6442-4415-B2F6-050E2A142D09' Win64="$(var.Win64)">
 						<File Id='badRainbowXml' Name='bad_rainbow.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/bad_rainbow.xml' KeyPath='yes' />
 						<File Id='brightXml' Name='bright.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/bright.xml' KeyPath='no' />
 						<File Id='darkXml' Name='dark.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/dark.xml' KeyPath='no' />
@@ -247,190 +256,208 @@
 				</Directory>
 
 				<Directory Id='DataFallback' Name='fallback'>
-					<Component Id='FallbackData' Guid='C65B7880-BDD8-4A5F-98C4-9E53A3441BBC'>
+					<Component Id='FallbackData' Guid='C65B7880-BDD8-4A5F-98C4-9E53A3441BBC' Win64="$(var.Win64)">
 						<File Id='applicationSettingsXml' Name='ApplicationSettings.xml' DiskId='1' Source='./../../../bin/app/data/fallback/ApplicationSettings.xml' KeyPath='yes' />
 						<File Id='window_settingsIni' Name='window_settings.ini' DiskId='1' Source='./../../../bin/app/data/fallback/window_settings.ini' KeyPath='no' />
 					</Component>
 				</Directory>
 
 				<Directory Id='DataGui' Name='gui'>
-					<Component Id='MainCss' Guid='70C63F6F-C13B-4EDA-94D4-7884A8BEFA55'>
+					<Component Id='MainCss' Guid='70C63F6F-C13B-4EDA-94D4-7884A8BEFA55' Win64="$(var.Win64)">
 						<File Id='Main' Name='main.css' DiskId='1' Source='./../../../bin/app/data/gui/main.css' KeyPath='yes' />
 					</Component>
-					<Component Id='SplashBluePng' Guid='914A5336-8D25-4748-8874-AF78A7A2669E'>
+					<Component Id='SplashBluePng' Guid='914A5336-8D25-4748-8874-AF78A7A2669E' Win64="$(var.Win64)">
 						<File Id='SplashBlue' Name='splash_blue.png' DiskId='1' Source='./../../../bin/app/data/gui/splash_blue.png' KeyPath='yes' />
 					</Component>
-					<Component Id='SplashWhitePng' Guid='0567B438-1770-4201-B040-E63480544315'>
+					<Component Id='SplashWhitePng' Guid='0567B438-1770-4201-B040-E63480544315' Win64="$(var.Win64)">
 						<File Id='SplashWhite' Name='splash_white.png' DiskId='1' Source='./../../../bin/app/data/gui/splash_white.png' KeyPath='yes' />
 					</Component>
 
 					<Directory Id='DataAbout' Name='about'>
-						<Component Id='AboutCss' Guid='137816FE-E17E-47FF-8826-FBD74E4E5BB7'>
+						<Component Id='AboutCss' Guid='137816FE-E17E-47FF-8826-FBD74E4E5BB7' Win64="$(var.Win64)">
 							<File Id='About' Name='about.css' DiskId='1' Source='./../../../bin/app/data/gui/about/about.css' KeyPath='yes' />
 						</Component>
-						<Component Id='IconClosePng' Guid='42FE1C4F-B78E-49C5-91F2-FBCA584B802E'>
+						<Component Id='IconClosePng' Guid='42FE1C4F-B78E-49C5-91F2-FBCA584B802E' Win64="$(var.Win64)">
 							<File Id='IconClose' Name='icon_close.png' DiskId='1' Source='./../../../bin/app/data/gui/about/icon_close.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoAwsPng' Guid='B20C4EB0-1782-4575-A653-F48DE9D9C4B8'>
+						<Component Id='LogoAwsPng' Guid='B20C4EB0-1782-4575-A653-F48DE9D9C4B8' Win64="$(var.Win64)">
 							<File Id='LogoAws' Name='logo_aws.png' DiskId='1' Source='./../../../bin/app/data/gui/about/logo_aws.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoCoatiPng' Guid='3ACD90D9-6099-4E95-AD99-AF7CD695BEB9'>
+						<Component Id='LogoCoatiPng' Guid='3ACD90D9-6099-4E95-AD99-AF7CD695BEB9' Win64="$(var.Win64)">
 							<File Id='LogoCoati' Name='logo_coati.png' DiskId='1' Source='./../../../bin/app/data/gui/about/logo_coati.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoFhsPng' Guid='1CEBF789-6E41-4E33-A04B-5B809343C665'>
+						<Component Id='LogoFhsPng' Guid='1CEBF789-6E41-4E33-A04B-5B809343C665' Win64="$(var.Win64)">
 							<File Id='LogoFhs' Name='logo_fhs.png' DiskId='1' Source='./../../../bin/app/data/gui/about/logo_fhs.png' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataCodeView' Name='code_view'>
-						<Component Id='CodeViewCss' Guid='D880FDCE-037E-4401-95D5-38D4472C9A47'>
+						<Component Id='CodeViewCss' Guid='D880FDCE-037E-4401-95D5-38D4472C9A47' Win64="$(var.Win64)">
 							<File Id='CodeView' Name='code_view.css' DiskId='1' Source='./../../../bin/app/data/gui/code_view/code_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataCodeViewImages' Name='images'>
-							<Component Id='EditPng' Guid='09F23361-CE52-4D04-8E3D-34821EBF57B3'>
-								<File Id='Edit' Name='edit.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/edit.png' KeyPath='yes' />
+							<Component Id='CodeViewArrowLeftPng' Guid='1681081F-E3E9-4C4E-9B37-E2BB8C86C31D' Win64="$(var.Win64)">
+								<File Id='CodeViewArrowLeft' Name='arrow_left.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/arrow_left.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MaximizeActivePng' Guid='9B88537F-5FB8-4066-AD68-BE7DA72B935D'>
-								<File Id='MaximizeActive' Name='maximize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_active.png' KeyPath='yes' />
+							<Component Id='CodeViewArrowRightPng' Guid='C6F66D82-A160-4B6F-925C-B5CD67FD7D3E' Win64="$(var.Win64)">
+								<File Id='CodeViewArrowRight' Name='arrow_right.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/arrow_right.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MaximizeInactivePng' Guid='77B2BF1E-3692-458E-8320-05865EE810F7'>
-								<File Id='MaximizeInactive' Name='maximize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_inactive.png' KeyPath='yes' />
+							<Component Id='CodeViewEditPng' Guid='09F23361-CE52-4D04-8E3D-34821EBF57B3' Win64="$(var.Win64)">
+								<File Id='CodeViewEdit' Name='edit.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/edit.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MinimizeActivePng' Guid='572C5209-BF5C-470B-9586-35895D273B71'>
-								<File Id='MinimizeActive' Name='minimize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_active.png' KeyPath='yes' />
+							<Component Id='CodeViewFilePng' Guid='EE69B9C0-2AB0-41F3-83AB-C0318801A22E' Win64="$(var.Win64)">
+								<File Id='CodeViewFile' Name='file.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/file.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MinimizeInactivePng' Guid='0C8E74E5-7BF3-4AC7-BE87-EBD3C43491ED'>
-								<File Id='MinimizeInactive' Name='minimize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_inactive.png' KeyPath='yes' />
+							<Component Id='CodeViewListPng' Guid='DD4BD02F-2998-4C74-ADFD-1FE94A0DF24D' Win64="$(var.Win64)">
+								<File Id='CodeViewList' Name='list.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/list.png' KeyPath='yes' />
 							</Component>
-							<Component Id='PatternPng' Guid='400BD0CD-3309-497E-9135-7E34C45B4A8E'>
-								<File Id='Pattern' Name='pattern.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/pattern.png' KeyPath='yes' />
+							<Component Id='CodeViewMaximizeActivePng' Guid='9B88537F-5FB8-4066-AD68-BE7DA72B935D' Win64="$(var.Win64)">
+								<File Id='CodeViewMaximizeActive' Name='maximize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_active.png' KeyPath='yes' />
 							</Component>
-							<Component Id='SnippetActivePng' Guid='59121177-A2D9-4A9E-BF92-EFA3CA0955D2'>
-								<File Id='SnippetActive' Name='snippet_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_active.png' KeyPath='yes' />
+							<Component Id='CodeViewMaximizeInactivePng' Guid='77B2BF1E-3692-458E-8320-05865EE810F7' Win64="$(var.Win64)">
+								<File Id='CodeViewMaximizeInactive' Name='maximize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_inactive.png' KeyPath='yes' />
 							</Component>
-							<Component Id='SnippetInactivePng' Guid='EA3522FC-EF33-4732-8F93-586985EB0549'>
-								<File Id='SnippetInactive' Name='snippet_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_inactive.png' KeyPath='yes' />
+							<Component Id='CodeViewMinimizeActivePng' Guid='572C5209-BF5C-470B-9586-35895D273B71' Win64="$(var.Win64)">
+								<File Id='CodeViewMinimizeActive' Name='minimize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_active.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewMinimizeInactivePng' Guid='0C8E74E5-7BF3-4AC7-BE87-EBD3C43491ED' Win64="$(var.Win64)">
+								<File Id='CodeViewMinimizeInactive' Name='minimize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_inactive.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewPatternPng' Guid='400BD0CD-3309-497E-9135-7E34C45B4A8E' Win64="$(var.Win64)">
+								<File Id='CodeViewPattern' Name='pattern.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/pattern.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewSnippetActivePng' Guid='59121177-A2D9-4A9E-BF92-EFA3CA0955D2' Win64="$(var.Win64)">
+								<File Id='CodeViewSnippetActive' Name='snippet_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_active.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewSnippetInactivePng' Guid='EA3522FC-EF33-4732-8F93-586985EB0549' Win64="$(var.Win64)">
+								<File Id='CodeViewSnippetInactive' Name='snippet_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_inactive.png' KeyPath='yes' />
 							</Component>
 
 						</Directory>
 					</Directory>
 					
 					<Directory Id='DataErrorView' Name='error_view'>
-						<Component Id='ErrorViewCss' Guid='9B8639F7-1123-49A2-9A15-E3372AE6ECFD'>
+						<Component Id='ErrorViewCss' Guid='9B8639F7-1123-49A2-9A15-E3372AE6ECFD' Win64="$(var.Win64)">
 							<File Id='ErrorView' Name='error_view.css' DiskId='1' Source='./../../../bin/app/data/gui/error_view/error_view.css' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataGraphView' Name='graph_view'>
-						<Component Id='GraphViewCss' Guid='BC8CDF1A-5831-4686-927C-C9E26ED85A3B'>
+						<Component Id='GraphViewCss' Guid='BC8CDF1A-5831-4686-927C-C9E26ED85A3B' Win64="$(var.Win64)">
 							<File Id='GraphView' Name='graph_view.css' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/graph_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataGraphViewImages' Name='images'>
-							<Component Id='ArrowGraphPng' Guid='EEC8C2CE-A647-4640-81DB-8297C46355E8'>
+							<Component Id='ArrowGraphPng' Guid='EEC8C2CE-A647-4640-81DB-8297C46355E8' Win64="$(var.Win64)">
 								<File Id='ArrowGraph' Name='arrow.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/arrow.png' KeyPath='yes' />
 							</Component>
-							<Component Id='BundlePng' Guid='67CA6A53-7DEA-48F1-9BD3-2CFA65AB554E'>
+							<Component Id='BundlePng' Guid='67CA6A53-7DEA-48F1-9BD3-2CFA65AB554E' Win64="$(var.Win64)">
 								<File Id='Bundle' Name='bundle.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/bundle.png' KeyPath='yes' />
 							</Component>
-							<Component Id='EnumPng' Guid='47724B89-D417-465C-B96E-1D60A6E7A99E'>
+							<Component Id='EnumPng' Guid='47724B89-D417-465C-B96E-1D60A6E7A99E' Win64="$(var.Win64)">
 								<File Id='Enum' Name='enum.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/enum.png' KeyPath='yes' />
 							</Component>
-							<Component Id='FilePng' Guid='72DA9267-AFB9-46B3-996E-67116FB6852E'>
+							<Component Id='FilePng' Guid='72DA9267-AFB9-46B3-996E-67116FB6852E' Win64="$(var.Win64)">
 								<File Id='File' Name='file.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/file.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MacroPng' Guid='7F9F1D3D-645A-4AEA-871A-4FA9229EA663'>
+							<Component Id='MacroPng' Guid='7F9F1D3D-645A-4AEA-871A-4FA9229EA663' Win64="$(var.Win64)">
 								<File Id='Macro' Name='macro.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/macro.png' KeyPath='yes' />
 							</Component>
-							<Component Id='NamespacePng' Guid='E3E7F161-3DD9-443B-A0AC-192C37DAE4CB'>
+							<Component Id='NamespacePng' Guid='E3E7F161-3DD9-443B-A0AC-192C37DAE4CB' Win64="$(var.Win64)">
 								<File Id='Namespace' Name='namespace.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/namespace.png' KeyPath='yes' />
 							</Component>
-							<Component Id='GraphPatternPng' Guid='80B2562B-3DB0-42DA-B68A-B43120646EBA'>
+							<Component Id='GraphPatternPng' Guid='80B2562B-3DB0-42DA-B68A-B43120646EBA' Win64="$(var.Win64)">
 								<File Id='GraphPattern' Name='pattern.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/pattern.png' KeyPath='yes' />
 							</Component>
-							<Component Id='PrivatePng' Guid='E7FC3AAE-634F-4012-9AE4-41598C303183'>
+							<Component Id='PrivatePng' Guid='E7FC3AAE-634F-4012-9AE4-41598C303183' Win64="$(var.Win64)">
 								<File Id='Private' Name='private.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/private.png' KeyPath='yes' />
 							</Component>
-							<Component Id='ProtectedPng' Guid='D7EE1C80-C68E-42BB-B16F-F114DA635BB9'>
+							<Component Id='ProtectedPng' Guid='D7EE1C80-C68E-42BB-B16F-F114DA635BB9' Win64="$(var.Win64)">
 								<File Id='Protected' Name='protected.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/protected.png' KeyPath='yes' />
 							</Component>
-							<Component Id='PublicPng' Guid='66E2CB4C-A9D8-4450-B630-393009D021A1'>
+							<Component Id='PublicPng' Guid='66E2CB4C-A9D8-4450-B630-393009D021A1' Win64="$(var.Win64)">
 								<File Id='Public' Name='public.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/public.png' KeyPath='yes' />
 							</Component>
-							<Component Id='TemplatePng' Guid='0CEF2BCE-C9C8-417A-89E9-8CB6478C4E89'>
+							<Component Id='TemplatePng' Guid='0CEF2BCE-C9C8-417A-89E9-8CB6478C4E89' Win64="$(var.Win64)">
 								<File Id='Template' Name='template.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/template.png' KeyPath='yes' />
 							</Component>
-							<Component Id='TypedefPng' Guid='6B171ABD-0222-4477-A17E-C745C37D8B45'>
+							<Component Id='TypedefPng' Guid='6B171ABD-0222-4477-A17E-C745C37D8B45' Win64="$(var.Win64)">
 								<File Id='Typedef' Name='typedef.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/typedef.png' KeyPath='yes' />
 							</Component>
+							<Component Id='ZoomInPng' Guid='1917AF50-2729-4EE8-BFB0-CCD201CDD92C' Win64="$(var.Win64)">
+								<File Id='ZoomIn' Name='zoom_in.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/zoom_in.png' KeyPath='yes' />
+							</Component>
+							<Component Id='ZoomOutPng' Guid='CD3041E9-8867-43AF-B85C-F023C39B0C1D' Win64="$(var.Win64)">
+								<File Id='ZoomOut' Name='zoom_out.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/zoom_out.png' KeyPath='yes' />
+							</Component>
 
 						</Directory>
 					</Directory>
 
 					<Directory Id='DataIcon' Name='icon'>
-						<Component Id='C_icon_Png' Guid='5455ADA0-2477-4F46-9BEE-62DCB71D639F'>
+						<Component Id='C_icon_Png' Guid='5455ADA0-2477-4F46-9BEE-62DCB71D639F' Win64="$(var.Win64)">
 							<File Id='C_icon' Name='c_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/c_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Cdb_icon_Png' Guid='BFEF4175-69DA-49E3-A650-9C5995A3E8E7'>
+						<Component Id='Cdb_icon_Png' Guid='BFEF4175-69DA-49E3-A650-9C5995A3E8E7' Win64="$(var.Win64)">
 							<File Id='Cdb_icon' Name='cdb_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cdb_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='CoatiIco' Guid='9D65B057-EA87-4251-8898-9FAD23AD3371'>
+						<Component Id='CoatiIco' Guid='9D65B057-EA87-4251-8898-9FAD23AD3371' Win64="$(var.Win64)">
 							<File Id='Coati' Name='coati.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/coati.ico' KeyPath='yes' />
 						</Component>
-						<Component Id='Cpp_icon_Png' Guid='B9EB2C3F-6256-4F54-9F8C-7DC338424839'>
+						<Component Id='Cpp_icon_Png' Guid='B9EB2C3F-6256-4F54-9F8C-7DC338424839' Win64="$(var.Win64)">
 							<File Id='Cpp_icon' Name='cpp_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cpp_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Empty_icon_Png' Guid='47F0E4A4-F74A-4D43-AB9E-75D3B1AB46C7'>
+						<Component Id='Empty_icon_Png' Guid='47F0E4A4-F74A-4D43-AB9E-75D3B1AB46C7' Win64="$(var.Win64)">
 							<File Id='Empty_icon' Name='empty_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/empty_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Java_icon_Png' Guid='66920390-A101-45B7-8C61-EA9EDF0876D3'>
+						<Component Id='Java_icon_Png' Guid='66920390-A101-45B7-8C61-EA9EDF0876D3' Win64="$(var.Win64)">
 							<File Id='Java_icon' Name='java_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/java_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Logo_1024_1024_Png' Guid='4A25272C-380F-4414-BFBA-06C92D19B116'>
+						<Component Id='Logo_1024_1024_Png' Guid='4A25272C-380F-4414-BFBA-06C92D19B116' Win64="$(var.Win64)">
 							<File Id='Logo_1024_1024' Name='logo_1024_1024.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/logo_1024_1024.png' KeyPath='yes' />
 						</Component>
-						<Component Id='ProjectIco' Guid='CDAC3217-C104-4D88-98F9-C138825721D4'>
+						<Component Id='ProjectIco' Guid='CDAC3217-C104-4D88-98F9-C138825721D4' Win64="$(var.Win64)">
 							<File Id='Project' Name='project.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/project.ico' KeyPath='yes' />
 						</Component>
-						<Component Id='Project_256_256_Png' Guid='AD536928-0DE5-49BC-B33C-D1A9E9DDB74D'>
+						<Component Id='Project_256_256_Png' Guid='AD536928-0DE5-49BC-B33C-D1A9E9DDB74D' Win64="$(var.Win64)">
 							<File Id='Project_256_256' Name='project_256_256.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/project_256_256.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Vs_icon_Png' Guid='BBEDB96F-B0D5-4FA6-B808-E15A51921D69'>
+						<Component Id='Vs_icon_Png' Guid='BBEDB96F-B0D5-4FA6-B808-E15A51921D69' Win64="$(var.Win64)">
 							<File Id='Vs_icon' Name='vs_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/vs_icon.png' KeyPath='yes' />
 						</Component>
 
 					</Directory>
 
 					<Directory Id='DataIndexingDialog' Name='indexing_dialog'>
-						<Component Id='ErrorPng' Guid='90C8F0E3-C532-4088-A3CB-66CB1DEE0CCD'>
+						<Component Id='ErrorPng' Guid='90C8F0E3-C532-4088-A3CB-66CB1DEE0CCD' Win64="$(var.Win64)">
 							<File Id='Error' Name='error.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/error.png' KeyPath='yes' />
 						</Component>
-						<Component Id='FlagPng' Guid='35ED2A65-FC94-444B-83E3-57E202226F96'>
+						<Component Id='FlagPng' Guid='35ED2A65-FC94-444B-83E3-57E202226F96' Win64="$(var.Win64)">
 							<File Id='Flag' Name='flag.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/flag.png' KeyPath='yes' />
 						</Component>
-						<Component Id='IndexingDialogCss' Guid='97CA1B7B-8825-4E2D-BFD1-A9467239D1C1'>
+						<Component Id='IndexingDialogCss' Guid='97CA1B7B-8825-4E2D-BFD1-A9467239D1C1' Win64="$(var.Win64)">
 							<File Id='IndexingDialog' Name='indexing_dialog.css' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/indexing_dialog.css' KeyPath='yes' />
 						</Component>
-						<Component Id='ProgressBarElementPng' Guid='85B80506-6F42-457F-8B6D-148F20340545'>
+						<Component Id='ProgressBarElementPng' Guid='85B80506-6F42-457F-8B6D-148F20340545' Win64="$(var.Win64)">
 							<File Id='ProgressBarElement' Name='progress_bar_element.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/progress_bar_element.png' KeyPath='yes' />
 						</Component>
 
 					</Directory>
 
 					<Directory Id='DataLicense' Name='license'>
-						<Component Id='LicenseCss' Guid='3A9B9310-10B0-477E-A1D8-027666F22476'>
+						<Component Id='LicenseCss' Guid='3A9B9310-10B0-477E-A1D8-027666F22476' Win64="$(var.Win64)">
 							<File Id='License' Name='license.css' DiskId='1' Source='./../../../bin/app/data/gui/license/license.css' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataRefreshView' Name='refresh_view'>
-						<Component Id='RefreshViewCss' Guid='8AF888D9-BC4B-4AC3-8E2C-20B74F82A888'>
+						<Component Id='RefreshViewCss' Guid='8AF888D9-BC4B-4AC3-8E2C-20B74F82A888' Win64="$(var.Win64)">
 							<File Id='RefreshView' Name='refresh_view.css' DiskId='1' Source='./../../../bin/app/data/gui/refresh_view/refresh_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataRefreshViewImages' Name='images'>
-							<Component Id='RefreshPng' Guid='AD5F7B6B-0373-4207-B053-16293FC4C631'>
+							<Component Id='RefreshPng' Guid='AD5F7B6B-0373-4207-B053-16293FC4C631' Win64="$(var.Win64)">
 								<File Id='Refresh' Name='refresh.png' DiskId='1' Source='./../../../bin/app/data/gui/refresh_view/images/refresh.png' KeyPath='yes' />
 							</Component>
 						</Directory>
@@ -439,18 +466,18 @@
 
 					<Directory Id='DataSearchView' Name='search_view'>
 
-						<Component Id='SearchViewCss' Guid='77634E10-B955-48E1-BA12-12C1FA131C00'>
+						<Component Id='SearchViewCss' Guid='77634E10-B955-48E1-BA12-12C1FA131C00' Win64="$(var.Win64)">
 							<File Id='SearchView' Name='search_view.css' DiskId='1' Source='./../../../bin/app/data/gui/search_view/search_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataSearchViewImages' Name='images'>
-							<Component Id='ArrowSearchPng' Guid='43858971-6577-49F8-8787-BEAC7B88CED1'>
+							<Component Id='ArrowSearchPng' Guid='43858971-6577-49F8-8787-BEAC7B88CED1' Win64="$(var.Win64)">
 								<File Id='ArrowSearch' Name='arrow.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/arrow.png' KeyPath='yes' />
 							</Component>
-							<Component Id='HomePng' Guid='1D00476F-52C2-47F9-8A27-B583D9499311'>
+							<Component Id='HomePng' Guid='1D00476F-52C2-47F9-8A27-B583D9499311' Win64="$(var.Win64)">
 								<File Id='Home' Name='home.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/home.png' KeyPath='yes' />
 							</Component>
-							<Component Id='SearchPng' Guid='A7B6B305-1B68-4085-9ED9-EF0DCD810116'>
+							<Component Id='SearchPng' Guid='A7B6B305-1B68-4085-9ED9-EF0DCD810116' Win64="$(var.Win64)">
 								<File Id='Search' Name='search.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/search.png' KeyPath='yes' />
 							</Component>
 						</Directory>
@@ -459,39 +486,39 @@
 
 					<Directory Id='DataStartScreen' Name='startscreen'>
 
-						<Component Id='StartscreenCss' Guid='9D3496D5-735A-4686-ADE9-DEB19DF69045'>
+						<Component Id='StartscreenCss' Guid='9D3496D5-735A-4686-ADE9-DEB19DF69045' Win64="$(var.Win64)">
 							<File Id='Startscreen' Name='startscreen.css' DiskId='1' Source='./../../../bin/app/data/gui/startscreen/startscreen.css' KeyPath='yes' />
 						</Component>
 
 					</Directory>
 
 					<Directory Id='DataStatusbarView' Name='statusbar_view'>
-						<Component Id='DotPng' Guid='7F7173DC-E888-4F03-82CC-3DD86BF402C4'>
+						<Component Id='DotPng' Guid='7F7173DC-E888-4F03-82CC-3DD86BF402C4' Win64="$(var.Win64)">
 							<File Id='Dot' Name='dot.png' DiskId='1' Source='./../../../bin/app/data/gui/statusbar_view/dot.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LoaderGif' Guid='E0F92524-DDE8-442E-9AD6-A1B2123A979F'>
+						<Component Id='LoaderGif' Guid='E0F92524-DDE8-442E-9AD6-A1B2123A979F' Win64="$(var.Win64)">
 							<File Id='Loader' Name='loader.gif' DiskId='1' Source='./../../../bin/app/data/gui/statusbar_view/loader.gif' KeyPath='yes' />
 						</Component>
 					</Directory>
 					
 					<Directory Id='DataTabbedView' Name='tabbed_view'>
-						<Component Id='TabbedViewCss' Guid='190A03B1-405B-433A-A7CC-3DB9CB389B8B'>
+						<Component Id='TabbedViewCss' Guid='190A03B1-405B-433A-A7CC-3DB9CB389B8B' Win64="$(var.Win64)">
 							<File Id='TabbedView' Name='tabbed_view.css' DiskId='1' Source='./../../../bin/app/data/gui/tabbed_view/tabbed_view.css' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataUndoRedoView' Name='undoredo_view'>
 
-						<Component Id='UndoRedoViewCss' Guid='4B2A3FB0-C8F4-4FFE-AE49-93204C35506C'>
+						<Component Id='UndoRedoViewCss' Guid='4B2A3FB0-C8F4-4FFE-AE49-93204C35506C' Win64="$(var.Win64)">
 							<File Id='UndoRedoView' Name='undoredo_view.css' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/undoredo_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataUndoRedoViewImages' Name='images'>
 
-							<Component Id='ArrowLeftPng' Guid='71CD283C-88A6-4E3A-B3BD-D9F94B835875'>
+							<Component Id='ArrowLeftPng' Guid='71CD283C-88A6-4E3A-B3BD-D9F94B835875' Win64="$(var.Win64)">
 								<File Id='ArrowLeft' Name='arrow_left.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_left.png' KeyPath='yes' />
 							</Component>
-							<Component Id='ArrowRightPng' Guid='95C3B2B2-4411-4086-A75B-2E03B7A3119F'>
+							<Component Id='ArrowRightPng' Guid='95C3B2B2-4411-4086-A75B-2E03B7A3119F' Win64="$(var.Win64)">
 								<File Id='ArrowRight' Name='arrow_right.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_right.png' KeyPath='yes' />
 							</Component>
 
@@ -500,49 +527,49 @@
 
 					<Directory Id='DataWindow' Name='window'>
 
-						<Component Id='WindowDotsPng' Guid='CA2C89C9-91E3-4755-B7BB-DA2253807784'>
+						<Component Id='WindowDotsPng' Guid='CA2C89C9-91E3-4755-B7BB-DA2253807784' Win64="$(var.Win64)">
 							<File Id='WindowDots' Name='dots.png' DiskId='1' Source='./../../../bin/app/data/gui/window/dots.png' KeyPath='yes' />
 						</Component>
-						<Component Id='WindowDotsHoverPng' Guid='794B67FC-4E6D-4C26-B823-90981BA377BC'>
+						<Component Id='WindowDotsHoverPng' Guid='794B67FC-4E6D-4C26-B823-90981BA377BC' Win64="$(var.Win64)">
 							<File Id='WindowDotsHover' Name='dots_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/dots_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='HelpPng' Guid='0C8176BC-3976-4DF4-815E-B8D149856DD5'>
+						<Component Id='HelpPng' Guid='0C8176BC-3976-4DF4-815E-B8D149856DD5' Win64="$(var.Win64)">
 							<File Id='Help' Name='help.png' DiskId='1' Source='./../../../bin/app/data/gui/window/help.png' KeyPath='yes' />
 						</Component>
-						<Component Id='HelpHoverPng' Guid='9DB32AA5-AE80-43AC-B2AE-6043BF5E41BB'>
+						<Component Id='HelpHoverPng' Guid='9DB32AA5-AE80-43AC-B2AE-6043BF5E41BB' Win64="$(var.Win64)">
 							<File Id='HelpHover' Name='help_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/help_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='ListboxCss' Guid='ABA6E005-3E7D-4C08-8008-2F08F92C6196'>
+						<Component Id='ListboxCss' Guid='ABA6E005-3E7D-4C08-8008-2F08F92C6196' Win64="$(var.Win64)">
 							<File Id='Listbox' Name='listbox.css' DiskId='1' Source='./../../../bin/app/data/gui/window/listbox.css' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoPng' Guid='F136A7ED-FC0D-40AB-8BC0-B95CA9C3C0F1'>
+						<Component Id='LogoPng' Guid='F136A7ED-FC0D-40AB-8BC0-B95CA9C3C0F1' Win64="$(var.Win64)">
 							<File Id='Logo' Name='logo.png' DiskId='1' Source='./../../../bin/app/data/gui/window/logo.png' KeyPath='yes' />
 						</Component>
-						<Component Id='MinusPng' Guid='4D8D904E-60C2-499F-865F-56B1A88AE13C'>
+						<Component Id='MinusPng' Guid='4D8D904E-60C2-499F-865F-56B1A88AE13C' Win64="$(var.Win64)">
 							<File Id='Minus' Name='minus.png' DiskId='1' Source='./../../../bin/app/data/gui/window/minus.png' KeyPath='yes' />
 						</Component>
-						<Component Id='MinusHoverPng' Guid='DC6A016A-4FB3-48A3-ABB1-33534D2188D0'>
+						<Component Id='MinusHoverPng' Guid='DC6A016A-4FB3-48A3-ABB1-33534D2188D0' Win64="$(var.Win64)">
 							<File Id='MinusHover' Name='minus_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/minus_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='PlusPng' Guid='4A6C90C5-929B-4759-BCF1-7EA36F588BA3'>
+						<Component Id='PlusPng' Guid='4A6C90C5-929B-4759-BCF1-7EA36F588BA3' Win64="$(var.Win64)">
 							<File Id='Plus' Name='plus.png' DiskId='1' Source='./../../../bin/app/data/gui/window/plus.png' KeyPath='yes' />
 						</Component>
-						<Component Id='PlusHoverPng' Guid='BF773D9C-1C21-4949-8D9C-0A35F7ADBAC3'>
+						<Component Id='PlusHoverPng' Guid='BF773D9C-1C21-4949-8D9C-0A35F7ADBAC3' Win64="$(var.Win64)">
 							<File Id='PlusHover' Name='plus_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/plus_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='WindowRefreshPng' Guid='B562009C-EDFA-4CD9-AD70-906A3CE60FC0'>
+						<Component Id='WindowRefreshPng' Guid='B562009C-EDFA-4CD9-AD70-906A3CE60FC0' Win64="$(var.Win64)">
 							<File Id='WindowRefresh' Name='refresh.png' DiskId='1' Source='./../../../bin/app/data/gui/window/refresh.png' KeyPath='yes' />
 						</Component>
-						<Component Id='RefreshHoverPng' Guid='5F2FFEC8-149F-4AA4-8935-6EED3093DE23'>
+						<Component Id='RefreshHoverPng' Guid='5F2FFEC8-149F-4AA4-8935-6EED3093DE23' Win64="$(var.Win64)">
 							<File Id='RefreshHover' Name='refresh_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/refresh_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='SizeGripBlackPng' Guid='ADC8042C-3CDA-47C5-8FA7-5741394BE1D3'>
+						<Component Id='SizeGripBlackPng' Guid='ADC8042C-3CDA-47C5-8FA7-5741394BE1D3' Win64="$(var.Win64)">
 							<File Id='SizeGripBlack' Name='size_grip_black.png' DiskId='1' Source='./../../../bin/app/data/gui/window/size_grip_black.png' KeyPath='yes' />
 						</Component>
-						<Component Id='SizeGripWhitePng' Guid='223B9301-8CDB-4C41-A67E-03CE0558E48E'>
+						<Component Id='SizeGripWhitePng' Guid='223B9301-8CDB-4C41-A67E-03CE0558E48E' Win64="$(var.Win64)">
 							<File Id='SizeGripWhite' Name='size_grip_white.png' DiskId='1' Source='./../../../bin/app/data/gui/window/size_grip_white.png' KeyPath='yes' />
 						</Component>
-						<Component Id='WindowCss' Guid='C9BDB09F-7278-41BA-BF3B-AD335B7FB129'>
+						<Component Id='WindowCss' Guid='C9BDB09F-7278-41BA-BF3B-AD335B7FB129' Win64="$(var.Win64)">
 							<File Id='Window' Name='window.css' DiskId='1' Source='./../../../bin/app/data/gui/window/window.css' KeyPath='yes' />
 						</Component>
 
@@ -552,28 +579,28 @@
 
 				<Directory Id='DataJava' Name='java'>
 
-					<Component Id='JavaGuavaJar' Guid='BAA854D3-5669-4E1E-94DF-33B3C84DDD23'>
+					<Component Id='JavaGuavaJar' Guid='BAA854D3-5669-4E1E-94DF-33B3C84DDD23' Win64="$(var.Win64)">
 						<File Id='JavaGuava' Name='guava-18.0.jar' DiskId='1' Source='./../../../bin/app/data/java/guava-18.0.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaIndexerJar' Guid='C1195927-A4ED-4296-936D-3BC059FCF8D2'>
+					<Component Id='JavaJavaIndexerJar' Guid='C1195927-A4ED-4296-936D-3BC059FCF8D2' Win64="$(var.Win64)">
 						<File Id='JavaJavaIndexer' Name='java-indexer.jar' DiskId='1' Source='./../../../bin/app/data/java/java-indexer.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaparserJar' Guid='25232CF0-2629-4988-AF7C-B142D5B0753E'>
+					<Component Id='JavaJavaparserJar' Guid='25232CF0-2629-4988-AF7C-B142D5B0753E' Win64="$(var.Win64)">
 						<File Id='JavaJavaparser' Name='javaparser-core.jar' DiskId='1' Source='./../../../bin/app/data/java/javaparser-core.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaslangJar' Guid='2F43B4B1-DE99-40BC-9908-5C179CF7F734'>
+					<Component Id='JavaJavaslangJar' Guid='2F43B4B1-DE99-40BC-9908-5C179CF7F734' Win64="$(var.Win64)">
 						<File Id='JavaJavaslang' Name='javaslang-2.0.3.jar' DiskId='1' Source='./../../../bin/app/data/java/javaslang-2.0.3.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavassistJar' Guid='D4F80CFF-5DCD-4AEF-A334-001774CAE605'>
+					<Component Id='JavaJavassistJar' Guid='D4F80CFF-5DCD-4AEF-A334-001774CAE605' Win64="$(var.Win64)">
 						<File Id='JavaJavassist' Name='javassist-3.19.0-GA.jar' DiskId='1' Source='./../../../bin/app/data/java/javassist-3.19.0-GA.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaSymbolSolverCoreJar' Guid='54EE8AA0-3C50-4189-9159-ED6132127EDC'>
+					<Component Id='JavaJavaSymbolSolverCoreJar' Guid='54EE8AA0-3C50-4189-9159-ED6132127EDC' Win64="$(var.Win64)">
 						<File Id='JavaJavaSymbolSolverCore' Name='java-symbol-solver-core.jar' DiskId='1' Source='./../../../bin/app/data/java/java-symbol-solver-core.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaSymbolSolverLogicJar' Guid='EA03C7C3-31A9-47EF-A565-70E0D4F1A4F9'>
+					<Component Id='JavaJavaSymbolSolverLogicJar' Guid='EA03C7C3-31A9-47EF-A565-70E0D4F1A4F9' Win64="$(var.Win64)">
 						<File Id='JavaJavaSymbolSolverLogic' Name='java-symbol-solver-logic.jar' DiskId='1' Source='./../../../bin/app/data/java/java-symbol-solver-logic.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaSymbolSolverModelJar' Guid='1BE000DF-98A9-44FA-8EE6-DC25C239B051'>
+					<Component Id='JavaJavaSymbolSolverModelJar' Guid='1BE000DF-98A9-44FA-8EE6-DC25C239B051' Win64="$(var.Win64)">
 						<File Id='JavaJavaSymbolSolverModel' Name='java-symbol-solver-model.jar' DiskId='1' Source='./../../../bin/app/data/java/java-symbol-solver-model.jar' KeyPath='yes' />
 					</Component>
 
@@ -582,9 +609,16 @@
 
 			</Directory>
 
-			<Component Id='UninstallBat' Guid='75D67FBD-06C8-4D3C-AE1D-4802456F4466'>
-				<File Id='Uninstall' Name='uninstall.bat' DiskId='1' Source='./../../../bin/app/data/install/uninstall_wix.bat' KeyPath='yes' />
+<?if $(sys.BUILDARCH) = x64 ?>
+			<Component Id='UninstallBat' Guid='75D67FBD-06C8-4D3C-AE1D-4802456F4466' Win64="$(var.Win64)">
+				<File Id='Uninstall' Name='uninstall.bat' DiskId='1' Source='./../../../bin/app/data/install/uninstall_wix_win64.bat' KeyPath='yes' />
 			</Component>
+<?else ?>
+			<Component Id='UninstallBat' Guid='75D67FBD-06C8-4D3C-AE1D-4802456F4466' Win64="$(var.Win64)">
+				<File Id='Uninstall' Name='uninstall.bat' DiskId='1' Source='./../../../bin/app/data/install/uninstall_wix_win32.bat' KeyPath='yes' />
+			</Component>
+<?endif ?>
+			
 
 		</DirectoryRef>
 	</Fragment>
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-console-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-console-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-console-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-console-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-datetime-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-datetime-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-datetime-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-datetime-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-debug-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-debug-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-debug-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-debug-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-errorhandling-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-errorhandling-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-errorhandling-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-errorhandling-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-file-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-file-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-file-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-file-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-file-l1-2-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-file-l1-2-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-file-l1-2-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-file-l1-2-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-file-l2-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-file-l2-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-file-l2-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-file-l2-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-handle-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-handle-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-handle-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-handle-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-heap-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-heap-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-heap-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-heap-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-interlocked-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-interlocked-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-interlocked-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-interlocked-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-libraryloader-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-libraryloader-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-libraryloader-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-libraryloader-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-localization-l1-2-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-localization-l1-2-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-localization-l1-2-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-localization-l1-2-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-memory-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-memory-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-memory-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-memory-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-namedpipe-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-namedpipe-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-namedpipe-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-namedpipe-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-processenvironment-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-processenvironment-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-processenvironment-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-processenvironment-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-processthreads-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-processthreads-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-processthreads-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-processthreads-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-processthreads-l1-1-1.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-processthreads-l1-1-1.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-processthreads-l1-1-1.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-processthreads-l1-1-1.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-profile-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-profile-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-profile-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-profile-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-rtlsupport-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-rtlsupport-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-rtlsupport-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-rtlsupport-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-string-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-string-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-string-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-string-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-synch-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-synch-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-synch-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-synch-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-synch-l1-2-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-synch-l1-2-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-synch-l1-2-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-synch-l1-2-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-sysinfo-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-sysinfo-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-sysinfo-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-sysinfo-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-timezone-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-timezone-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-timezone-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-timezone-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-core-util-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-core-util-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-core-util-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-core-util-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-conio-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-conio-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-conio-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-conio-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-convert-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-convert-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-convert-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-convert-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-environment-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-environment-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-environment-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-environment-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-filesystem-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-filesystem-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-filesystem-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-filesystem-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-heap-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-heap-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-heap-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-heap-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-locale-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-locale-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-locale-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-locale-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-math-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-math-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-math-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-math-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-multibyte-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-multibyte-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-multibyte-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-multibyte-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-private-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-private-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-private-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-private-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-process-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-process-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-process-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-process-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-runtime-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-runtime-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-runtime-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-runtime-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-stdio-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-stdio-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-stdio-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-stdio-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-string-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-string-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-string-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-string-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-time-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-time-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-time-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-time-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/api-ms-win-crt-utility-l1-1-0.dll b/deployment/windows/wixSetup/lib/win32/api-ms-win-crt-utility-l1-1-0.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/api-ms-win-crt-utility-l1-1-0.dll
rename to deployment/windows/wixSetup/lib/win32/api-ms-win-crt-utility-l1-1-0.dll
diff --git a/deployment/windows/wixSetup/lib/msvcp140.dll b/deployment/windows/wixSetup/lib/win32/msvcp140.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/msvcp140.dll
rename to deployment/windows/wixSetup/lib/win32/msvcp140.dll
diff --git a/deployment/windows/wixSetup/lib/ucrtbase.dll b/deployment/windows/wixSetup/lib/win32/ucrtbase.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/ucrtbase.dll
rename to deployment/windows/wixSetup/lib/win32/ucrtbase.dll
diff --git a/deployment/windows/wixSetup/lib/vcruntime140.dll b/deployment/windows/wixSetup/lib/win32/vcruntime140.dll
similarity index 100%
rename from deployment/windows/wixSetup/lib/vcruntime140.dll
rename to deployment/windows/wixSetup/lib/win32/vcruntime140.dll
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-console-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-console-l1-1-0.dll
new file mode 100644
index 00000000..f603a82e
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-console-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-datetime-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-datetime-l1-1-0.dll
new file mode 100644
index 00000000..74ce3e3e
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-datetime-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-debug-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-debug-l1-1-0.dll
new file mode 100644
index 00000000..cb91d73c
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-debug-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-errorhandling-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-errorhandling-l1-1-0.dll
new file mode 100644
index 00000000..09c57caf
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-errorhandling-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l1-1-0.dll
new file mode 100644
index 00000000..8cdb3642
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l1-2-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l1-2-0.dll
new file mode 100644
index 00000000..13bed227
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l1-2-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l2-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l2-1-0.dll
new file mode 100644
index 00000000..9876b4a9
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-file-l2-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-handle-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-handle-l1-1-0.dll
new file mode 100644
index 00000000..98013b04
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-handle-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-heap-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-heap-l1-1-0.dll
new file mode 100644
index 00000000..0c22a3a7
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-heap-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-interlocked-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-interlocked-l1-1-0.dll
new file mode 100644
index 00000000..622458b5
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-interlocked-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-libraryloader-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-libraryloader-l1-1-0.dll
new file mode 100644
index 00000000..bf81ae14
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-libraryloader-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-localization-l1-2-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-localization-l1-2-0.dll
new file mode 100644
index 00000000..4c966f35
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-localization-l1-2-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-memory-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-memory-l1-1-0.dll
new file mode 100644
index 00000000..5caf6ce6
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-memory-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-namedpipe-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-namedpipe-l1-1-0.dll
new file mode 100644
index 00000000..97159f45
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-namedpipe-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processenvironment-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processenvironment-l1-1-0.dll
new file mode 100644
index 00000000..a4dced0c
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processenvironment-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processthreads-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processthreads-l1-1-0.dll
new file mode 100644
index 00000000..f428c0a9
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processthreads-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processthreads-l1-1-1.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processthreads-l1-1-1.dll
new file mode 100644
index 00000000..208f6020
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-processthreads-l1-1-1.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-profile-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-profile-l1-1-0.dll
new file mode 100644
index 00000000..07879836
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-profile-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-rtlsupport-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-rtlsupport-l1-1-0.dll
new file mode 100644
index 00000000..7ba6d642
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-rtlsupport-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-string-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-string-l1-1-0.dll
new file mode 100644
index 00000000..20dd5e9d
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-string-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-synch-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-synch-l1-1-0.dll
new file mode 100644
index 00000000..3eb1329e
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-synch-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-synch-l1-2-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-synch-l1-2-0.dll
new file mode 100644
index 00000000..3f0bf0f4
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-synch-l1-2-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-sysinfo-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-sysinfo-l1-1-0.dll
new file mode 100644
index 00000000..825ed72c
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-sysinfo-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-timezone-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-timezone-l1-1-0.dll
new file mode 100644
index 00000000..eb5fc8ea
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-timezone-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-core-util-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-util-l1-1-0.dll
new file mode 100644
index 00000000..84427a63
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-core-util-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-conio-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-conio-l1-1-0.dll
new file mode 100644
index 00000000..937f2e67
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-conio-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-convert-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-convert-l1-1-0.dll
new file mode 100644
index 00000000..38403070
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-convert-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-environment-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-environment-l1-1-0.dll
new file mode 100644
index 00000000..7ef063b2
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-environment-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-filesystem-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-filesystem-l1-1-0.dll
new file mode 100644
index 00000000..c50cd677
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-filesystem-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-heap-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-heap-l1-1-0.dll
new file mode 100644
index 00000000..1392eff5
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-heap-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-locale-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-locale-l1-1-0.dll
new file mode 100644
index 00000000..82552419
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-locale-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-math-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-math-l1-1-0.dll
new file mode 100644
index 00000000..6473c9b0
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-math-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-multibyte-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-multibyte-l1-1-0.dll
new file mode 100644
index 00000000..bcdb4fd2
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-multibyte-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-private-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-private-l1-1-0.dll
new file mode 100644
index 00000000..ecfb25a8
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-private-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-process-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-process-l1-1-0.dll
new file mode 100644
index 00000000..1b3dd6db
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-process-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-runtime-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-runtime-l1-1-0.dll
new file mode 100644
index 00000000..47d09130
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-runtime-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-stdio-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-stdio-l1-1-0.dll
new file mode 100644
index 00000000..30eeeabc
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-stdio-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-string-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-string-l1-1-0.dll
new file mode 100644
index 00000000..563d7c81
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-string-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-time-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-time-l1-1-0.dll
new file mode 100644
index 00000000..daf93ea7
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-time-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-utility-l1-1-0.dll b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-utility-l1-1-0.dll
new file mode 100644
index 00000000..83d2a515
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/api-ms-win-crt-utility-l1-1-0.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/msvcp140.dll b/deployment/windows/wixSetup/lib/win64/msvcp140.dll
new file mode 100644
index 00000000..977de104
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/msvcp140.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/ucrtbase.dll b/deployment/windows/wixSetup/lib/win64/ucrtbase.dll
new file mode 100644
index 00000000..9f56094f
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/ucrtbase.dll differ
diff --git a/deployment/windows/wixSetup/lib/win64/vcruntime140.dll b/deployment/windows/wixSetup/lib/win64/vcruntime140.dll
new file mode 100644
index 00000000..61efa0c9
Binary files /dev/null and b/deployment/windows/wixSetup/lib/win64/vcruntime140.dll differ
diff --git a/script/build.sh b/script/build.sh
index 184ecffa..162c064c 100755
--- a/script/build.sh
+++ b/script/build.sh
@@ -19,28 +19,28 @@ then
 	if [ "$2" = "test" ]
 	then
 		#echo "release test"
-		cd bin/test && Release/Coati_test
+		cd bin/test && ../../build/Release/Release/test/Coati_test
 	elif [ "$2" = "keygen" ]
 	then
 		#echo "release keygen"
-		cd bin/license_generator && Release/Coati_license_generator
+		cd bin/license_generator && ../../build/Release/Release/license_generator/Coati_license_generator
 	else
 		#echo "release app"
-		cd bin/app && Release/Coati
+		cd bin/app && ../../build/Release/Release/app/Coati
 	fi
 elif [ "$1" = "debug" ] || [ "$1" = "d" ]
 then
 	if [ "$2" = "test" ]
 	then
 		#echo "debug test"
-		cd bin/test && Debug/Coati_test
+		cd bin/test && ../../build/Debug/Debug/test/Coati_test
 	elif [ "$2" = "keygen" ]
 	then
 		#echo "debug keygen"
-		cd bin/license_generator && Debug/Coati_license_generator
+		cd bin/license_generator && ../../build/Debug/Debug/license_generator/Coati_license_generator
 	else
 		#echo "debug app"
-		cd bin/app && Debug/Coati
+		cd bin/app && ../../build/Debug/Debug/app/Coati
 	fi
 else
 	echo "no arguments: first argument 'release' or 'debug', second argument 'test' for tests"
diff --git a/script/clean.sh b/script/clean.sh
index e67c44a7..4aef2ad7 100755
--- a/script/clean.sh
+++ b/script/clean.sh
@@ -30,27 +30,20 @@ cd $ROOT_DIR/
 if [ $PLATFORM == "Windows" ]; then
 	BACKSLASHED_ROOT_DIR="${ROOT_DIR//\//\\}"
     # Remove symbolic links
-    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\data' &
-    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\user' &
-    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Release\data' &
-    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Release\user' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win32\Debug\app\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win32\Debug\app\user' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win32\Release\app\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win32\Release\app\user' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win64\Debug\app\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win64\Debug\app\user' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win64\Release\app\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\build\win64\Release\app\user' &
 fi
 
 # Remove folders and contents
+rm -rf java_indexer/bin
 rm -rf java_indexer/lib
 rm -rf build
-rm -rf bin/app/Debug
-rm -rf bin/app/Release
-rm -rf bin/lib/Debug
-rm -rf bin/lib/Release
-rm -rf bin/test/Debug
-rm -rf bin/test/Release
-rm -rf bin/gen
-rm -rf bin/lib
-rm -rf bin/lib_gui
-rm -rf bin/lib_license
-rm -rf bin/lib_parser
-rm -rf bin/license_generator
 
 # Remove log files
 find bin/test/data/log -type f -name 'log*' -delete
diff --git a/script/create_windows_icon.sh b/script/create_windows_icon.sh
index 6b8686d5..75884063 100644
--- a/script/create_windows_icon.sh
+++ b/script/create_windows_icon.sh
@@ -1,10 +1,11 @@
 MY_PATH=`dirname "$0"`
 
 ICON_INPUT_PATH=$MY_PATH/../bin/app/data/gui/icon
-ICON_OUTPUT_PATH=$MY_PATH/../build
 ICON_SIZES_PATH=$ICON_INPUT_PATH/sizes
+ICON_BUILD_PATH=$ICON_INPUT_PATH/build
 
 mkdir -p $ICON_SIZES_PATH
+mkdir -p $ICON_BUILD_PATH
 
 convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 16x16 $ICON_SIZES_PATH/icon_16.png
 convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 24x24 $ICON_SIZES_PATH/icon_24.png
@@ -15,6 +16,10 @@ convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 64x64 $ICON_SIZES_PATH/icon_
 convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 128x128 $ICON_SIZES_PATH/icon_128.png
 convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 256x256 $ICON_SIZES_PATH/icon_256.png
 
-convert $ICON_SIZES_PATH/icon_16.png $ICON_SIZES_PATH/icon_24.png $ICON_SIZES_PATH/icon_32.png $ICON_SIZES_PATH/icon_40.png $ICON_SIZES_PATH/icon_48.png $ICON_SIZES_PATH/icon_64.png $ICON_SIZES_PATH/icon_128.png $ICON_SIZES_PATH/icon_256.png -colors 256 $ICON_OUTPUT_PATH/coati.ico
+convert $ICON_SIZES_PATH/icon_16.png $ICON_SIZES_PATH/icon_24.png $ICON_SIZES_PATH/icon_32.png $ICON_SIZES_PATH/icon_40.png $ICON_SIZES_PATH/icon_48.png $ICON_SIZES_PATH/icon_64.png $ICON_SIZES_PATH/icon_128.png $ICON_SIZES_PATH/icon_256.png -colors 256 $ICON_BUILD_PATH/coati.ico
+
+cp $ICON_BUILD_PATH/coati.ico $MY_PATH/../build/win32
+cp $ICON_BUILD_PATH/coati.ico $MY_PATH/../build/win64
 
 rm -rf $ICON_SIZES_PATH
+rm -rf $ICON_BUILD_PATH
diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh
index a69b1db8..4eae9cd4 100644
--- a/script/deploy_windows.sh
+++ b/script/deploy_windows.sh
@@ -1,4 +1,5 @@
 # FLAGS
+CLEAN_AND_SETUP=true
 REBUILD=true
 OBFUSCATE=true
 UPDATE_DATABASES=true
@@ -16,6 +17,10 @@ BASE_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
 
 cd $BASE_DIR/..
 
+if [ $CLEAN_AND_SETUP = false ]; then
+	echo -e "$INFO CLEAN_AND_SETUP flag is set to false. Do you want to proceed?"
+	read -p "Press [Enter] key to continue"
+fi
 
 if [ $REBUILD = false ]; then
 	echo -e "$INFO REBUILD flag is set to false. Do you want to proceed?"
@@ -44,21 +49,30 @@ rm -rf src/lib_gui/platform_includes/deploy.h
 echo "#define DEPLOY" >src/lib_gui/platform_includes/deploy.h
 
 
-### TODO: RUN CMAKE!
-
 ### TODO: add HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\12.0_Config\MSBuild\EnableOutOfProcBuild
 
 
-# CLEANING THE PROJECT
-if [ $REBUILD = true ]; then
+if [ $CLEAN_AND_SETUP = true ]; then
 	echo -e "$INFO cleaning the project"
-	"devenv.com" build/Coati.sln //clean Release
+	script/clean.sh
+	echo -e "$INFO setting the project up"
+	script/setup.sh
 fi
 
 
-# BUILDING THE EXECUTABLE
-echo -e "$INFO building the executable (app)"
-"devenv.com" build/Coati.sln //build Release //project build/Coati.vcxproj
+# CLEANING THE SOLUTIONS
+if [ $REBUILD = true ]; then
+	echo -e "$INFO cleaning the solution"
+	"devenv.com" build/win32/Coati.sln //clean Release
+	"devenv.com" build/win64/Coati.sln //clean Release
+fi
+
+
+# BUILDING THE EXECUTABLES
+echo -e "$INFO building the app (32 bit)"
+"devenv.com" build/win32/Coati.sln //build Release //project build/win32/Coati.vcxproj
+echo -e "$INFO building the app (64 bit)"
+"devenv.com" build/win64/Coati.sln //build Release //project build/win64/Coati.vcxproj
 
 
 # CREATING DATABASES
@@ -74,35 +88,41 @@ if [ $UPDATE_DATABASES = true ]; then
 	cd temp
 
 	echo -e "$INFO saving license key"
-	../bin/app/Release/Coati.exe -z ../script/license.txt
+	../build/win32/Release/app/Coati.exe -z ../script/license.txt
 
 	echo -e "$INFO creating database for tictactie"
-	../bin/app/Release/Coati.exe -p ../bin/app/user/projects/tictactoe/tictactoe.coatiproject -d
+	../build/win32/Release/app/Coati.exe -p ../bin/app/user/projects/tictactoe/tictactoe.coatiproject -d
 
 	echo -e "$INFO creating database for tutorial"
-	../bin/app/Release/Coati.exe -p ../bin/app/user/projects/tutorial/tutorial.coatiproject -d
+	../build/win32/Release/app/Coati.exe -p ../bin/app/user/projects/tutorial/tutorial.coatiproject -d
 
 	echo -e "$INFO creating database for javaparser"
-	../bin/app/Release/Coati.exe -p ../bin/app/user/projects/javaparser/javaparser.coatiproject -d
+	../build/win32/Release/app/Coati.exe -p ../bin/app/user/projects/javaparser/javaparser.coatiproject -d
 
 	cd ..
 	rm -rf temp
 fi
 
 
-# OBFUSCATING THE EXECUTABLE
+# OBFUSCATING THE EXECUTABLES
 if [ $OBFUSCATE = true ]; then
-	echo -e "$INFO obfuscating the executables"
-	rm bin/app/Release/Coati_obfuscated.exe
-	upx --brute -o bin/app/Release/Coati_obfuscated.exe bin/app/Release/Coati.exe
+	echo -e "$INFO obfuscating the executable (32 bit)"
+	rm build/win32/Release/app/Coati_obfuscated.exe
+	upx --brute -o build/win32/Release/app/Coati_obfuscated.exe build/win32/Release/app/Coati.exe
+	
+	echo -e "$INFO obfuscating the executable (64 bit)"
+	rm build/win64/Release/app/Coati_obfuscated.exe
+	upx --brute -o build/win64/Release/app/Coati_obfuscated.exe build/win64/Release/app/Coati.exe
 else
-	cp bin/app/Release/Coati.exe bin/app/Release/Coati_obfuscated.exe
+	cp build/win32/Release/app/Coati.exe build/win32/Release/app/Coati_obfuscated.exe
+	cp build/win64/Release/app/Coati.exe build/win64/Release/app/Coati_obfuscated.exe
 fi
 
 
 # BUILDING THE INSTALLER
 cd deployment/windows/wixSetup
-build.bat
+build_win32.sh
+build_win64.sh
 cd ../../..
 
 
@@ -112,42 +132,68 @@ VERSION_STRING="${VERSION_STRING//-/_}"
 VERSION_STRING="${VERSION_STRING//./_}"
 VERSION_STRING="${VERSION_STRING%_*}"
 
-APP_PACKAGE_NAME=Coati_${VERSION_STRING}
+echo -e "$INFO creating package folder for win32"
+APP_PACKAGE_NAME_WIN32=Coati_${VERSION_STRING}_32bit
+APP_PACKAGE_DIR_WIN32=release/$APP_PACKAGE_NAME_WIN32
 
-APP_PACKAGE_DIR=release/$APP_PACKAGE_NAME
+rm -rf $APP_PACKAGE_DIR_WIN32
+mkdir -p $APP_PACKAGE_DIR_WIN32
 
-echo -e "$INFO creating package folder"
-rm -rf $APP_PACKAGE_DIR
-mkdir -p $APP_PACKAGE_DIR
+cp -u -r deployment/windows/wixSetup/bin/win32/* $APP_PACKAGE_DIR_WIN32/
 
-cp -u -r deployment/windows/wixSetup/bin/* $APP_PACKAGE_DIR/
+mkdir -p $APP_PACKAGE_DIR_WIN32/plugins/atom/
+cp -u -r ide_plugins/atom/* $APP_PACKAGE_DIR_WIN32/plugins/atom/
+mkdir -p $APP_PACKAGE_DIR_WIN32/plugins/eclipse/
+cp -u -r ide_plugins/eclipse/* $APP_PACKAGE_DIR_WIN32/plugins/eclipse/
+mkdir -p $APP_PACKAGE_DIR_WIN32/plugins/emacs/
+cp -u -r ide_plugins/emacs/* $APP_PACKAGE_DIR_WIN32/plugins/emacs/
+mkdir -p $APP_PACKAGE_DIR_WIN32/plugins/idea/
+cp -u -r ide_plugins/idea/* $APP_PACKAGE_DIR_WIN32/plugins/idea/
+mkdir -p $APP_PACKAGE_DIR_WIN32/plugins/sublime_text/
+cp -u -r ide_plugins/sublime_text/* $APP_PACKAGE_DIR_WIN32/plugins/sublime_text/
+mkdir -p $APP_PACKAGE_DIR_WIN32/plugins/vim/
+cp -u -r ide_plugins/vim/* $APP_PACKAGE_DIR_WIN32/plugins/vim/
+mkdir -p $APP_PACKAGE_DIR_WIN32/plugins/visual_studio/
+cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $APP_PACKAGE_DIR_WIN32/plugins/visual_studio/
 
-mkdir -p $APP_PACKAGE_DIR/plugins/atom/
-cp -u -r ide_plugins/atom/* $APP_PACKAGE_DIR/plugins/atom/
-mkdir -p $APP_PACKAGE_DIR/plugins/eclipse/
-cp -u -r ide_plugins/eclipse/* $APP_PACKAGE_DIR/plugins/eclipse/
-mkdir -p $APP_PACKAGE_DIR/plugins/emacs/
-cp -u -r ide_plugins/emacs/* $APP_PACKAGE_DIR/plugins/emacs/
-mkdir -p $APP_PACKAGE_DIR/plugins/idea/
-cp -u -r ide_plugins/idea/* $APP_PACKAGE_DIR/plugins/idea/
-mkdir -p $APP_PACKAGE_DIR/plugins/sublime_text/
-cp -u -r ide_plugins/sublime_text/* $APP_PACKAGE_DIR/plugins/sublime_text/
-mkdir -p $APP_PACKAGE_DIR/plugins/vim/
-cp -u -r ide_plugins/vim/* $APP_PACKAGE_DIR/plugins/vim/
-mkdir -p $APP_PACKAGE_DIR/plugins/visual_studio/
-cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $APP_PACKAGE_DIR/plugins/visual_studio/
+
+echo -e "$INFO creating package folder for win64"
+APP_PACKAGE_NAME_WIN64=Coati_${VERSION_STRING}_64bit
+APP_PACKAGE_DIR_WIN64=release/$APP_PACKAGE_NAME_WIN64
+
+rm -rf $APP_PACKAGE_DIR_WIN64
+mkdir -p $APP_PACKAGE_DIR_WIN64
+
+cp -u -r deployment/windows/wixSetup/bin/win64/* $APP_PACKAGE_DIR_WIN64/
+
+mkdir -p $APP_PACKAGE_DIR_WIN64/plugins/atom/
+cp -u -r ide_plugins/atom/* $APP_PACKAGE_DIR_WIN64/plugins/atom/
+mkdir -p $APP_PACKAGE_DIR_WIN64/plugins/eclipse/
+cp -u -r ide_plugins/eclipse/* $APP_PACKAGE_DIR_WIN64/plugins/eclipse/
+mkdir -p $APP_PACKAGE_DIR_WIN64/plugins/emacs/
+cp -u -r ide_plugins/emacs/* $APP_PACKAGE_DIR_WIN64/plugins/emacs/
+mkdir -p $APP_PACKAGE_DIR_WIN64/plugins/idea/
+cp -u -r ide_plugins/idea/* $APP_PACKAGE_DIR_WIN64/plugins/idea/
+mkdir -p $APP_PACKAGE_DIR_WIN64/plugins/sublime_text/
+cp -u -r ide_plugins/sublime_text/* $APP_PACKAGE_DIR_WIN64/plugins/sublime_text/
+mkdir -p $APP_PACKAGE_DIR_WIN64/plugins/vim/
+cp -u -r ide_plugins/vim/* $APP_PACKAGE_DIR_WIN64/plugins/vim/
+mkdir -p $APP_PACKAGE_DIR_WIN64/plugins/visual_studio/
+cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $APP_PACKAGE_DIR_WIN64/plugins/visual_studio/
 
 
 # PACKAGING COATI
 echo -e "$INFO packaging coati"
 cd ./release/
-winrar a -afzip ${APP_PACKAGE_NAME}_Windows.zip $APP_PACKAGE_NAME
+winrar a -afzip Coati_${VERSION_STRING}_Windows_32bit.zip $APP_PACKAGE_NAME_WIN32
+winrar a -afzip Coati_${VERSION_STRING}_Windows_64bit.zip $APP_PACKAGE_NAME_WIN64
 cd ../
 
 
 # CLEANING UP
-echo -e "$INFO Cleaning"
-rm -rf $APP_PACKAGE_DIR
+echo -e "$INFO Cleaning package folders"
+rm -rf $APP_PACKAGE_DIR_WIN32
+rm -rf $APP_PACKAGE_DIR_WIN64
 
 
 # UNSETTING THE DEPLOY FLAG
diff --git a/script/license.txt b/script/license.txt
new file mode 100644
index 00000000..9f978e09
--- /dev/null
+++ b/script/license.txt
@@ -0,0 +1,13 @@
+-----BEGIN LICENSE-----
+Malte Langkabel
+Private/Academic Single User License
+Coati 0
+$9$AQAKVgXEpRqHfGMwWj/TA5YWrVmWWJrk5PmADbFYkewV7Ddvq+JV
+nT+lDlImNpfRQDY4YTJDYc0B/IW5n8ccn21HqLkRvR5t8T5/GvUzRNZ
+PnZfA/sE0tVBpS1IMEhUd5JIztHKXHFDdwcvIS7Z+y6vxn0knD0/VF4
+RjvvgicxikAnfF9cNxTb3IYAaUSREFTPejX6JABSai0jJhZLR4P9upK
+rj6OYFerGI2/+6D2UyBJhaAc2P3zcd2ivd01IRjJNeXlGA3r5mCcl5y
+SuPtreW3Yyq/uafyP1rV6uASIb+3oV6Y+jTo1kFYqEh8tjmrxOHbJLu
+3+wHyJgMu5fLhJFWAKyxPjVbY5A0nvQAb0F+ROSZZ5IiKKCYIcofcxt
+HrBYDDdP0rJw==
+-----END LICENSE-----
\ No newline at end of file
diff --git a/script/setup.sh b/script/setup.sh
index afb2769f..73f4898f 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -56,40 +56,66 @@ fi
 
 # Create Debug and Release folders
 echo -e $INFO "create build folders"
-
-mkdir -p build
-mkdir -p bin/app/Debug
-mkdir -p bin/app/Release
-mkdir -p bin/lib/Debug
-mkdir -p bin/lib/Release
-mkdir -p bin/test/Debug
-mkdir -p bin/test/Release
+if [ $PLATFORM == "Windows" ]; then
+	mkdir -p build/win32/Debug/app
+	mkdir -p build/win32/Debug/test
+	mkdir -p build/win32/Release/app
+	mkdir -p build/win32/Release/test
+	mkdir -p build/win64/Debug/app
+	mkdir -p build/win64/Debug/test
+	mkdir -p build/win64/Release/app
+	mkdir -p build/win64/Release/test
+else
+	mkdir -p build/Debug/app
+	mkdir -p build/Debug/test
+	mkdir -p build/Release/app
+	mkdir -p build/Release/test
+fi
 
 # Copy necessary dynamic libraries to bin folder
 if [ $PLATFORM == "Windows" ]; then
 	echo -e $INFO "copy dynamic libraries"
-	cp -u -r setup/dynamic_libraries/windows/app/Debug/* bin/app/Debug
-	cp -u -r setup/dynamic_libraries/windows/app/Release/* bin/app/Release
+	cp -u -r setup/dynamic_libraries/win32/app/Debug/* build/win32/Debug/app
+	cp -u -r setup/dynamic_libraries/win32/app/Release/* build/win32/Release/app
+	
+	cp -u -r setup/dynamic_libraries/win64/app/Debug/* build/win64/Debug/app
+	cp -u -r setup/dynamic_libraries/win64/app/Release/* build/win64/Release/app
+	
+	cp -u -r setup/dynamic_libraries/win32/app/Debug/Qt5* build/win32/Debug/test
+	cp -u -r setup/dynamic_libraries/win32/app/Debug/platforms* build/win32/Debug/test/platforms
+	cp -u -r setup/dynamic_libraries/win32/app/Release/Qt5* build/win32/Release/test
+	cp -u -r setup/dynamic_libraries/win32/app/Release/platforms* build/win32/Release/test/platforms
+	
+	cp -u -r setup/dynamic_libraries/win64/app/Debug/Qt5* build/win64/Debug/test
+	cp -u -r setup/dynamic_libraries/win64/app/Debug/platforms* build/win64/Debug/test/platforms
+	cp -u -r setup/dynamic_libraries/win64/app/Release/Qt5* build/win64/Release/test
+	cp -u -r setup/dynamic_libraries/win64/app/Release/platforms* build/win64/Release/test/platforms
 
 	echo -e $INFO "copy test_main file"
-	cp -u setup/cxx_test/windows/test_main.cpp build
+	cp -u setup/cxx_test/windows/test_main.cpp build/win32
+	cp -u setup/cxx_test/windows/test_main.cpp build/win64
 
 	echo -e $INFO "creating program icon"
 	sh script/create_windows_icon.sh
+fi
 
+echo -e $INFO "create symbolic links for data"
+if [ $PLATFORM == "Windows" ]; then
 	BACKSLASHED_ROOT_DIR="${ROOT_DIR//\//\\}"
-
-	echo -e $INFO "create symbolic links for data"
-	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
-	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
-	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Release\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
-	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Release\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win32\Debug\app\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win32\Debug\app\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win32\Release\app\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win32\Release\app\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
+	
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win64\Debug\app\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win64\Debug\app\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win64\Release\app\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win64\Release\app\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
 elif [ $PLATFORM == "Linux" ]; then
-	echo -e $INFO "create symbolic links for data"
-	cd $ROOT_DIR/bin/app/Release
-	ln -s -f ../data
-	cd $ROOT_DIR/bin/app/Debug
-	ln -s -f ../data
+	cd $ROOT_DIR/build/Release/app
+	ln -s -f $ROOT_DIR/bin/app/data
+	cd $ROOT_DIR/build/Debug/app
+	ln -s -f $ROOT_DIR/bin/app/data
 	cd $ROOT_DIR
 fi
 
@@ -103,6 +129,14 @@ if [ $PLATFORM == "Linux" ] || [ $PLATFORM == "MacOS" ]; then
 
 	echo -e $INFO "run cmake with Release configuration"
 	cd ../Release && cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" ../..
+else
+	echo -e $INFO "run cmake with 32 bit configuration"
+	
+	cd build/win32
+	cmake -G "Visual Studio 14 2015" ../..
+	
+	cd ../win64
+	cmake -G "Visual Studio 14 2015 Win64" ../..
 fi
 
 echo -e $SUCCESS "setup complete"
diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Cored.dll
similarity index 62%
rename from setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll
rename to setup/dynamic_libraries/win32/app/Debug/Qt5Cored.dll
index 9944c7e6..eed29951 100644
Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll and b/setup/dynamic_libraries/win32/app/Debug/Qt5Cored.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Guid.dll
similarity index 58%
rename from setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll
rename to setup/dynamic_libraries/win32/app/Debug/Qt5Guid.dll
index 61355a36..e891bca5 100644
Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll and b/setup/dynamic_libraries/win32/app/Debug/Qt5Guid.dll differ
diff --git a/setup/dynamic_libraries/win32/app/Debug/Qt5Networkd.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Networkd.dll
new file mode 100644
index 00000000..06aaec07
Binary files /dev/null and b/setup/dynamic_libraries/win32/app/Debug/Qt5Networkd.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll b/setup/dynamic_libraries/win32/app/Debug/Qt5Widgetsd.dll
similarity index 58%
rename from setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll
rename to setup/dynamic_libraries/win32/app/Debug/Qt5Widgetsd.dll
index 84f6c436..ffb4fc15 100644
Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll and b/setup/dynamic_libraries/win32/app/Debug/Qt5Widgetsd.dll differ
diff --git a/setup/dynamic_libraries/win32/app/Debug/platforms/qwindowsd.dll b/setup/dynamic_libraries/win32/app/Debug/platforms/qwindowsd.dll
new file mode 100644
index 00000000..4aa2c51f
Binary files /dev/null and b/setup/dynamic_libraries/win32/app/Debug/platforms/qwindowsd.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/qt.conf b/setup/dynamic_libraries/win32/app/Debug/qt.conf
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Debug/qt.conf
rename to setup/dynamic_libraries/win32/app/Debug/qt.conf
diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Core.dll
similarity index 52%
rename from setup/dynamic_libraries/windows/app/Release/Qt5Core.dll
rename to setup/dynamic_libraries/win32/app/Release/Qt5Core.dll
index a1074875..ece7d12c 100644
Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll and b/setup/dynamic_libraries/win32/app/Release/Qt5Core.dll differ
diff --git a/setup/dynamic_libraries/win32/app/Release/Qt5Gui.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Gui.dll
new file mode 100644
index 00000000..9f872a38
Binary files /dev/null and b/setup/dynamic_libraries/win32/app/Release/Qt5Gui.dll differ
diff --git a/setup/dynamic_libraries/win32/app/Release/Qt5Network.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Network.dll
new file mode 100644
index 00000000..48830605
Binary files /dev/null and b/setup/dynamic_libraries/win32/app/Release/Qt5Network.dll differ
diff --git a/setup/dynamic_libraries/win32/app/Release/Qt5Widgets.dll b/setup/dynamic_libraries/win32/app/Release/Qt5Widgets.dll
new file mode 100644
index 00000000..de881568
Binary files /dev/null and b/setup/dynamic_libraries/win32/app/Release/Qt5Widgets.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-console-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-console-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-console-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-console-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-datetime-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-datetime-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-datetime-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-datetime-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-debug-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-debug-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-debug-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-debug-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-file-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-file-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-file-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-file-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-file-l1-2-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-file-l1-2-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-file-l1-2-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-file-l1-2-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-file-l2-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-file-l2-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-file-l2-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-file-l2-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-handle-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-handle-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-handle-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-handle-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-heap-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-heap-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-heap-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-heap-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-interlocked-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-interlocked-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-interlocked-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-interlocked-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-localization-l1-2-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-localization-l1-2-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-localization-l1-2-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-localization-l1-2-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-memory-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-memory-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-memory-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-memory-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-processthreads-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-processthreads-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-processthreads-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-processthreads-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-processthreads-l1-1-1.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-processthreads-l1-1-1.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-processthreads-l1-1-1.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-processthreads-l1-1-1.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-profile-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-profile-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-profile-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-profile-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-string-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-string-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-string-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-string-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-synch-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-synch-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-synch-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-synch-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-synch-l1-2-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-synch-l1-2-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-synch-l1-2-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-synch-l1-2-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-timezone-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-timezone-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-timezone-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-timezone-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-core-util-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-core-util-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-core-util-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-core-util-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-conio-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-conio-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-conio-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-conio-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-convert-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-convert-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-convert-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-convert-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-environment-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-environment-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-environment-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-environment-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-heap-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-heap-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-heap-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-heap-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-locale-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-locale-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-locale-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-locale-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-math-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-math-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-math-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-math-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-private-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-private-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-private-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-private-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-process-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-process-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-process-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-process-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-runtime-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-runtime-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-runtime-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-runtime-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-stdio-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-stdio-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-stdio-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-stdio-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-string-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-string-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-string-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-string-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-time-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-time-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-time-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-time-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-utility-l1-1-0.dll b/setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-utility-l1-1-0.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/api-ms-win-crt-utility-l1-1-0.dll
rename to setup/dynamic_libraries/win32/app/Release/api-ms-win-crt-utility-l1-1-0.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/msvcp140.dll b/setup/dynamic_libraries/win32/app/Release/msvcp140.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/msvcp140.dll
rename to setup/dynamic_libraries/win32/app/Release/msvcp140.dll
diff --git a/setup/dynamic_libraries/win32/app/Release/platforms/qwindows.dll b/setup/dynamic_libraries/win32/app/Release/platforms/qwindows.dll
new file mode 100644
index 00000000..cc51ce89
Binary files /dev/null and b/setup/dynamic_libraries/win32/app/Release/platforms/qwindows.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Release/qt.conf b/setup/dynamic_libraries/win32/app/Release/qt.conf
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/qt.conf
rename to setup/dynamic_libraries/win32/app/Release/qt.conf
diff --git a/setup/dynamic_libraries/windows/app/Release/ucrtbase.dll b/setup/dynamic_libraries/win32/app/Release/ucrtbase.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/ucrtbase.dll
rename to setup/dynamic_libraries/win32/app/Release/ucrtbase.dll
diff --git a/setup/dynamic_libraries/windows/app/Release/vcruntime140.dll b/setup/dynamic_libraries/win32/app/Release/vcruntime140.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/app/Release/vcruntime140.dll
rename to setup/dynamic_libraries/win32/app/Release/vcruntime140.dll
diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Cored.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Cored.dll
new file mode 100644
index 00000000..56a1d51b
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Debug/Qt5Cored.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Guid.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Guid.dll
new file mode 100644
index 00000000..1d39761f
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Debug/Qt5Guid.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Networkd.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Networkd.dll
new file mode 100644
index 00000000..13b1f4ed
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Debug/Qt5Networkd.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Debug/Qt5Widgetsd.dll b/setup/dynamic_libraries/win64/app/Debug/Qt5Widgetsd.dll
new file mode 100644
index 00000000..be30afde
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Debug/Qt5Widgetsd.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Debug/platforms/qwindowsd.dll b/setup/dynamic_libraries/win64/app/Debug/platforms/qwindowsd.dll
new file mode 100644
index 00000000..a76e9a29
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Debug/platforms/qwindowsd.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Debug/qt.conf b/setup/dynamic_libraries/win64/app/Debug/qt.conf
new file mode 100644
index 00000000..367a59ee
--- /dev/null
+++ b/setup/dynamic_libraries/win64/app/Debug/qt.conf
@@ -0,0 +1,2 @@
+[Platforms]
+WindowsArguments = fontengine=freetype
diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Core.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Core.dll
new file mode 100644
index 00000000..f61330dc
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/Qt5Core.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Gui.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Gui.dll
new file mode 100644
index 00000000..2706f855
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/Qt5Gui.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Network.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Network.dll
new file mode 100644
index 00000000..6378dbe0
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/Qt5Network.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/Qt5Widgets.dll b/setup/dynamic_libraries/win64/app/Release/Qt5Widgets.dll
new file mode 100644
index 00000000..af336484
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/Qt5Widgets.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-console-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-console-l1-1-0.dll
new file mode 100644
index 00000000..f603a82e
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-console-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-datetime-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-datetime-l1-1-0.dll
new file mode 100644
index 00000000..74ce3e3e
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-datetime-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-debug-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-debug-l1-1-0.dll
new file mode 100644
index 00000000..cb91d73c
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-debug-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll
new file mode 100644
index 00000000..09c57caf
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l1-1-0.dll
new file mode 100644
index 00000000..8cdb3642
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l1-2-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l1-2-0.dll
new file mode 100644
index 00000000..13bed227
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l1-2-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l2-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l2-1-0.dll
new file mode 100644
index 00000000..9876b4a9
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-file-l2-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-handle-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-handle-l1-1-0.dll
new file mode 100644
index 00000000..98013b04
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-handle-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-heap-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-heap-l1-1-0.dll
new file mode 100644
index 00000000..0c22a3a7
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-heap-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-interlocked-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-interlocked-l1-1-0.dll
new file mode 100644
index 00000000..622458b5
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-interlocked-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll
new file mode 100644
index 00000000..bf81ae14
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-localization-l1-2-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-localization-l1-2-0.dll
new file mode 100644
index 00000000..4c966f35
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-localization-l1-2-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-memory-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-memory-l1-1-0.dll
new file mode 100644
index 00000000..5caf6ce6
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-memory-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll
new file mode 100644
index 00000000..97159f45
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll
new file mode 100644
index 00000000..a4dced0c
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processthreads-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processthreads-l1-1-0.dll
new file mode 100644
index 00000000..f428c0a9
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processthreads-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processthreads-l1-1-1.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processthreads-l1-1-1.dll
new file mode 100644
index 00000000..208f6020
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-processthreads-l1-1-1.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-profile-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-profile-l1-1-0.dll
new file mode 100644
index 00000000..07879836
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-profile-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll
new file mode 100644
index 00000000..7ba6d642
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-string-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-string-l1-1-0.dll
new file mode 100644
index 00000000..20dd5e9d
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-string-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-synch-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-synch-l1-1-0.dll
new file mode 100644
index 00000000..3eb1329e
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-synch-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-synch-l1-2-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-synch-l1-2-0.dll
new file mode 100644
index 00000000..3f0bf0f4
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-synch-l1-2-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll
new file mode 100644
index 00000000..825ed72c
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-timezone-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-timezone-l1-1-0.dll
new file mode 100644
index 00000000..eb5fc8ea
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-timezone-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-util-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-util-l1-1-0.dll
new file mode 100644
index 00000000..84427a63
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-core-util-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-conio-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-conio-l1-1-0.dll
new file mode 100644
index 00000000..937f2e67
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-conio-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-convert-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-convert-l1-1-0.dll
new file mode 100644
index 00000000..38403070
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-convert-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-environment-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-environment-l1-1-0.dll
new file mode 100644
index 00000000..7ef063b2
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-environment-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll
new file mode 100644
index 00000000..c50cd677
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-heap-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-heap-l1-1-0.dll
new file mode 100644
index 00000000..1392eff5
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-heap-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-locale-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-locale-l1-1-0.dll
new file mode 100644
index 00000000..82552419
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-locale-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-math-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-math-l1-1-0.dll
new file mode 100644
index 00000000..6473c9b0
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-math-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll
new file mode 100644
index 00000000..bcdb4fd2
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-private-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-private-l1-1-0.dll
new file mode 100644
index 00000000..ecfb25a8
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-private-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-process-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-process-l1-1-0.dll
new file mode 100644
index 00000000..1b3dd6db
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-process-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-runtime-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-runtime-l1-1-0.dll
new file mode 100644
index 00000000..47d09130
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-runtime-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-stdio-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-stdio-l1-1-0.dll
new file mode 100644
index 00000000..30eeeabc
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-stdio-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-string-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-string-l1-1-0.dll
new file mode 100644
index 00000000..563d7c81
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-string-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-time-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-time-l1-1-0.dll
new file mode 100644
index 00000000..daf93ea7
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-time-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-utility-l1-1-0.dll b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-utility-l1-1-0.dll
new file mode 100644
index 00000000..83d2a515
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/api-ms-win-crt-utility-l1-1-0.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/msvcp140.dll b/setup/dynamic_libraries/win64/app/Release/msvcp140.dll
new file mode 100644
index 00000000..977de104
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/msvcp140.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/platforms/qwindows.dll b/setup/dynamic_libraries/win64/app/Release/platforms/qwindows.dll
new file mode 100644
index 00000000..62afc772
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/platforms/qwindows.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/qt.conf b/setup/dynamic_libraries/win64/app/Release/qt.conf
new file mode 100644
index 00000000..367a59ee
--- /dev/null
+++ b/setup/dynamic_libraries/win64/app/Release/qt.conf
@@ -0,0 +1,2 @@
+[Platforms]
+WindowsArguments = fontengine=freetype
diff --git a/setup/dynamic_libraries/win64/app/Release/ucrtbase.dll b/setup/dynamic_libraries/win64/app/Release/ucrtbase.dll
new file mode 100644
index 00000000..9f56094f
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/ucrtbase.dll differ
diff --git a/setup/dynamic_libraries/win64/app/Release/vcruntime140.dll b/setup/dynamic_libraries/win64/app/Release/vcruntime140.dll
new file mode 100644
index 00000000..61efa0c9
Binary files /dev/null and b/setup/dynamic_libraries/win64/app/Release/vcruntime140.dll differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Networkd.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Networkd.dll
deleted file mode 100644
index 71cee60e..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Networkd.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll b/setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll
deleted file mode 100644
index 09e81fb8..00000000
Binary files a/setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll
deleted file mode 100644
index 9334b19c..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Network.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Network.dll
deleted file mode 100644
index a9d0b308..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Network.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll
deleted file mode 100644
index 7390957f..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll and /dev/null differ
diff --git a/setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll b/setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll
deleted file mode 100644
index 6c6a06e3..00000000
Binary files a/setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll and /dev/null differ
diff --git a/setup/git/git_pre_commit_hook.sh b/setup/git/git_pre_commit_hook.sh
index 985a7413..4180e8bd 100755
--- a/setup/git/git_pre_commit_hook.sh
+++ b/setup/git/git_pre_commit_hook.sh
@@ -39,7 +39,7 @@ function build_type {
 	if [ "$PLATFORM" == "Windows" ]
 	then
 		echo -e $INFO Builing the Coati VS Solution
-		cmake --build build --config $1
+		cmake --build build/win32 --config $1
 		if [ $? -ne 0 ]
 		then
 			echo -e $FAIL At least one build or test failed, no push to $branch
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 57f4c0b2..46fc5bc7 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -102,8 +102,6 @@ int main(int argc, char *argv[])
 {
 	QApplication::setApplicationName("Coati");
 
-	setupLogging();
-
 	if (QSysInfo::windowsVersion() != QSysInfo::WV_None)
 	{
 		QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
@@ -129,6 +127,8 @@ int main(int argc, char *argv[])
 
 		setupApp(argc, argv);
 
+		setupLogging();
+
 		Application::createInstance(version, nullptr, nullptr);
 		ScopedFunctor f([](){
 			Application::destroyInstance();
@@ -179,6 +179,8 @@ int main(int argc, char *argv[])
 
 		setupApp(argc, argv);
 
+		setupLogging();
+
 		qtApp.setAttribute(Qt::AA_UseHighDpiPixmaps);
 
 		QtViewFactory viewFactory;
diff --git a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h b/src/lib/utility/scheduling/TaskReturnSuccessWhile.h
index f0522283..f85eea48 100644
--- a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h
+++ b/src/lib/utility/scheduling/TaskReturnSuccessWhile.h
@@ -66,8 +66,6 @@ Task::TaskState TaskReturnSuccessWhile<T>::doUpdate(std::shared_ptr<Blackboard>
 			return STATE_SUCCESS;
 		}
 		break;
-	default:
-		return STATE_FAILURE;
 	}
 	return STATE_FAILURE;
 }
diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp
index 116ba304..341bb3e3 100644
--- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp
+++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp
@@ -129,6 +129,8 @@ void CxxAstVisitorComponentDeclRefKind::visitCastExpr(clang::CastExpr* s)
 	case clang::CK_ToVoid:
 	case clang::CK_LValueToRValue:
 		m_childRefKind = REFERENCE_USAGE;
+	default:
+		break;
 	}
 }
 
diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp
index a22861d5..93840a35 100644
--- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp
+++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp
@@ -377,7 +377,7 @@ void CxxAstVisitorComponentIndexer::visitTypeLoc(clang::TypeLoc tl)
 	if ((shouldVisitReference(tl.getBeginLoc(), getAstVisitor()->getComponent<CxxAstVisitorComponentContext>()->getTopmostContextDecl())) &&
 		(!getAstVisitor()->checkIgnoresTypeLoc(tl)))
 	{
-		if (const clang::BuiltinType* builtinType = clang::dyn_cast_or_null<clang::BuiltinType>(tl.getTypePtr()))
+		if (clang::dyn_cast_or_null<clang::BuiltinType>(tl.getTypePtr()))
 		{
 			m_client->recordSymbol(getAstVisitor()->getTypeNameCache()->getValue(tl.getTypePtr()), SYMBOL_BUILTIN_TYPE, ACCESS_NONE, DEFINITION_EXPLICIT);
 		}
diff --git a/src/lib_gui/platform_includes/includesWindows.h b/src/lib_gui/platform_includes/includesWindows.h
index 1981a087..46bc5eb4 100644
--- a/src/lib_gui/platform_includes/includesWindows.h
+++ b/src/lib_gui/platform_includes/includesWindows.h
@@ -8,6 +8,7 @@
 
 #include "utility/file/FileSystem.h"
 #include "utility/UserPaths.h"
+#include "utility/utilityApp.h"
 
 #include "platform_includes/deploy.h"
 
@@ -19,7 +20,15 @@ void setupApp(int argc, char *argv[])
 {
 #ifdef DEPLOY
 	std::string path = std::getenv("APPDATA");
-	path += "/../local/Coati Software/Coati/";
+	path += "/../local/Coati Software/";
+	if (utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_64)
+	{
+		path += "Coati 64-bit/";
+	}
+	else
+	{
+		path += "Coati/";
+	}
 	UserPaths::setUserDataPath(path);
 #else
 	std::string path = QDir::currentPath().toStdString();
diff --git a/src/lib_gui/qt/graphics/QtGraphicsView.cpp b/src/lib_gui/qt/graphics/QtGraphicsView.cpp
index 5f283498..faf0d2f8 100644
--- a/src/lib_gui/qt/graphics/QtGraphicsView.cpp
+++ b/src/lib_gui/qt/graphics/QtGraphicsView.cpp
@@ -139,12 +139,12 @@ void QtGraphicsView::updateZoom(float delta)
 void QtGraphicsView::refreshStyle()
 {
 	m_zoomInButton->setIcon(utility::createButtonIcon(
-		ResourcePaths::getGuiPath() + "graph_view/images/zoomin.png",
+		ResourcePaths::getGuiPath() + "graph_view/images/zoom_in.png",
 		"search/button"
 	));
 
 	m_zoomOutButton->setIcon(utility::createButtonIcon(
-		ResourcePaths::getGuiPath() + "graph_view/images/zoomout.png",
+		ResourcePaths::getGuiPath() + "graph_view/images/zoom_out.png",
 		"search/button"
 	));
 }
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
index b880eb69..99ba3f25 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
@@ -116,7 +116,7 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
 #ifdef _WIN32
 	QString filter = "JVM Library (jvm.dll)";
 #elif __APPLE__
-	QString filter = "JVM Library (libjvm.dylib)";
+	QString filter = "JLI or JVM Library (libjli.dylib libjvm.dylib)";
 #else
 	QString filter = "JVM Library (libjvm.so)";
 #endif
@@ -128,7 +128,7 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
 	}
 	else if (QSysInfo::macVersion() != QSysInfo::MV_None)
 	{
-		m_javaPath->setPlaceholderText("<jre_path>Contents/Home/jre/lib/server/libjvm.dylib");
+		m_javaPath->setPlaceholderText("<jre_path>/Contents/Home/jre/lib/jli/libjli.dylib");
 	}
 	else
 	{
diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp
index df76a6db..2b34a599 100644
--- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp
+++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp
@@ -21,6 +21,16 @@ std::vector<FilePath> JavaPathDetectorMac::getPaths() const
 	std::string output = utility::executeProcess(command.c_str());
 
 	if (output.size())
+	{
+		javaPath = FilePath(utility::trim(output) + "/jre/lib/jli/libjli.dylib");
+	}
+
+	if (!javaPath.exists())
+	{
+		javaPath = FilePath("/usr/lib/libjli.dylib");
+	}
+
+	if (!javaPath.exists() && output.size())
 	{
 		javaPath = FilePath(utility::trim(output) + "/jre/lib/server/libjvm.dylib");
 	}
diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
index c6159483..025e751d 100644
--- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
+++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
@@ -3,6 +3,8 @@
 #include <QSettings>
 #include <QSysInfo>
 
+#include "utility/utilityApp.h"
+
 JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion)
 	: JavaPathDetector("Java " + javaVersion + " for Windows", javaVersion)
 {
@@ -16,7 +18,10 @@ std::vector<FilePath> JavaPathDetectorWindows::getPaths() const
 {
 	QString key = "HKEY_LOCAL_MACHINE\\SOFTWARE\\";
 
-	key += "Wow6432Node\\"; // we need java 32 bit
+	if (utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_32)
+	{
+		key += "Wow6432Node\\";
+	}
 
 	key += ("JavaSoft\\Java Runtime Environment\\" + m_javaVersion).c_str();
 
diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h
index 7363ceb9..d0ddf3d1 100644
--- a/src/test/JavaParserTestSuite.h
+++ b/src/test/JavaParserTestSuite.h
@@ -1,6 +1,7 @@
 #include "cxxtest/TestSuite.h"
 
-
+#include "settings/ApplicationSettings.h"
+#include "utility/utilityPathDetection.h"
 #include "utility/file/FileRegister.h"
 #include "utility/text/TextAccess.h"
 #include "utility/utility.h"
@@ -21,6 +22,12 @@ public:
 
 	void test_java_parser_can_setup_environment_factory()
 	{
+		std::vector<FilePath> javaPaths = utility::getJavaRuntimePathDetector()->getPaths();
+		if (!javaPaths.empty())
+		{
+			ApplicationSettings::getInstance()->setJavaPath(javaPaths[0].str());
+		}
+
 		setupJavaEnvironmentFactory();
 
 		// if this one fails, maybe your java_path in the test settings is wrong.
@@ -501,7 +508,7 @@ public:
 		TS_ASSERT(utility::containsElement<std::string>(
 			client->calls, "void foo.X.B.bar() -> void foo.X.A.bar() <15:10 15:12>"
 		));
-	}										
+	}
 
 	void test_java_parser_finds_usage_of_field_with_same_name_as_method_parameter()
 	{