From daee73a59f56e8c96a0250245105ce8144a2bab4 Mon Sep 17 00:00:00 2001
From: Peter Lama <peterldev94@gmail.com>
Date: Mon, 31 Jul 2017 21:00:30 -0400
Subject: [PATCH] Remove obsolete files

---
 BuildAll.bat                            |  21 --
 BuildRelease.ini                        |  19 --
 BuildRelease.py                         | 342 ------------------------
 src/Tools/WixFileTool.py                |  33 ---
 src/Tools/wiki2chm.py                   | 254 ------------------
 src/WindowsInstaller/BuildInstaller.bat |  32 ---
 src/WindowsInstaller/BuildRelease.bat   |  13 -
 src/WindowsInstaller/CopyRelease.bat.in |   4 -
 src/WindowsInstaller/FreeCAD.wxs        | 224 ----------------
 src/WindowsInstaller/FreeCADBase.wxs    |  87 ------
 src/WindowsInstaller/FreeCADData.wxs    | 118 --------
 src/WindowsInstaller/FreeCADDoc.wxs     |  42 ---
 src/WindowsInstaller/FreeCADModules.wxs |  60 -----
 src/WindowsInstaller/LibPack.wxs        | 269 -------------------
 src/WindowsInstaller/LibPackDll.wxi     |  61 -----
 src/WindowsInstaller/ModArch.wxi        |  56 ----
 src/WindowsInstaller/ModCam.wxi         |  33 ---
 src/WindowsInstaller/ModComplete.wxi    |  33 ---
 src/WindowsInstaller/ModDraft.wxi       |  47 ----
 src/WindowsInstaller/ModDrawing.wxi     |  33 ---
 src/WindowsInstaller/ModFem.wxi         |  34 ---
 src/WindowsInstaller/ModImage.wxi       |  33 ---
 src/WindowsInstaller/ModImport.wxi      |  33 ---
 src/WindowsInstaller/ModInspection.wxi  |  33 ---
 src/WindowsInstaller/ModMesh.wxi        |  35 ---
 src/WindowsInstaller/ModMeshPart.wxi    |  33 ---
 src/WindowsInstaller/ModOpenSCAD.wxi    |  50 ----
 src/WindowsInstaller/ModPart.wxi        |  35 ---
 src/WindowsInstaller/ModPartDesign.wxi  |  45 ----
 src/WindowsInstaller/ModPlot.wxi        |  74 -----
 src/WindowsInstaller/ModPoints.wxi      |  33 ---
 src/WindowsInstaller/ModRaytracing.wxi  |  33 ---
 src/WindowsInstaller/ModRobot.wxi       |  36 ---
 src/WindowsInstaller/ModShip.wxi        | 138 ----------
 src/WindowsInstaller/ModSketcher.wxi    |  34 ---
 src/WindowsInstaller/ModStart.wxi       |  39 ---
 src/WindowsInstaller/ModTest.wxi        |  41 ---
 src/WindowsInstaller/ModWeb.wxi         |  32 ---
 src/WindowsInstaller/Version.wxi.in     |   5 -
 39 files changed, 2577 deletions(-)
 delete mode 100644 BuildAll.bat
 delete mode 100644 BuildRelease.ini
 delete mode 100644 BuildRelease.py
 delete mode 100644 src/Tools/WixFileTool.py
 delete mode 100644 src/Tools/wiki2chm.py
 delete mode 100644 src/WindowsInstaller/BuildInstaller.bat
 delete mode 100644 src/WindowsInstaller/BuildRelease.bat
 delete mode 100644 src/WindowsInstaller/CopyRelease.bat.in
 delete mode 100644 src/WindowsInstaller/FreeCAD.wxs
 delete mode 100644 src/WindowsInstaller/FreeCADBase.wxs
 delete mode 100644 src/WindowsInstaller/FreeCADData.wxs
 delete mode 100644 src/WindowsInstaller/FreeCADDoc.wxs
 delete mode 100644 src/WindowsInstaller/FreeCADModules.wxs
 delete mode 100644 src/WindowsInstaller/LibPack.wxs
 delete mode 100644 src/WindowsInstaller/LibPackDll.wxi
 delete mode 100644 src/WindowsInstaller/ModArch.wxi
 delete mode 100644 src/WindowsInstaller/ModCam.wxi
 delete mode 100644 src/WindowsInstaller/ModComplete.wxi
 delete mode 100644 src/WindowsInstaller/ModDraft.wxi
 delete mode 100644 src/WindowsInstaller/ModDrawing.wxi
 delete mode 100644 src/WindowsInstaller/ModFem.wxi
 delete mode 100644 src/WindowsInstaller/ModImage.wxi
 delete mode 100644 src/WindowsInstaller/ModImport.wxi
 delete mode 100644 src/WindowsInstaller/ModInspection.wxi
 delete mode 100644 src/WindowsInstaller/ModMesh.wxi
 delete mode 100644 src/WindowsInstaller/ModMeshPart.wxi
 delete mode 100644 src/WindowsInstaller/ModOpenSCAD.wxi
 delete mode 100644 src/WindowsInstaller/ModPart.wxi
 delete mode 100644 src/WindowsInstaller/ModPartDesign.wxi
 delete mode 100644 src/WindowsInstaller/ModPlot.wxi
 delete mode 100644 src/WindowsInstaller/ModPoints.wxi
 delete mode 100644 src/WindowsInstaller/ModRaytracing.wxi
 delete mode 100644 src/WindowsInstaller/ModRobot.wxi
 delete mode 100644 src/WindowsInstaller/ModShip.wxi
 delete mode 100644 src/WindowsInstaller/ModSketcher.wxi
 delete mode 100644 src/WindowsInstaller/ModStart.wxi
 delete mode 100644 src/WindowsInstaller/ModTest.wxi
 delete mode 100644 src/WindowsInstaller/ModWeb.wxi
 delete mode 100644 src/WindowsInstaller/Version.wxi.in

diff --git a/BuildAll.bat b/BuildAll.bat
deleted file mode 100644
index 0afcd366b2..0000000000
--- a/BuildAll.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-rem   Build script, uses vcbuild to completetly build FreeCAD
-
-rem start again nice (LOW)
-if "%1"=="" (
-    start /WAIT /LOW /B cmd.exe /V /C %~s0 go_ahead
-    goto:eof
-)
-rem  set the aprobiated Variables here or outside in the system
-if NOT DEFINED VCDIR set VCDIR=C:\Program Files\Microsoft Visual Studio 9.0
-
-rem Register VS Build programms
-call "%VCDIR%\VC\vcvarsall.bat"
-
-rem "C:\Program Files\TortoiseSVN\bin\TortoiseProc.exe" /command:update /path:"C:\SW_Projects\CAD\FreeCAD_10" /closeonend:3
-
-
-rem Start the Visuall Studio build process
-"%VCDIR%\VC\vcpackages\vcbuild.exe" FreeCAD_trunk.sln "Debug|Win32" 
-"%VCDIR%\VC\vcpackages\vcbuild.exe" FreeCAD_trunk.sln "Debug|Win32" 
-"%VCDIR%\VC\vcpackages\vcbuild.exe" FreeCAD_trunk.sln "Release|Win32" 
diff --git a/BuildRelease.ini b/BuildRelease.ini
deleted file mode 100644
index 7084ae973e..0000000000
--- a/BuildRelease.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# Version of the release. The Revision number you must specify at the command line
-[Version] 
-Major: 0
-Minor: 7
-Alias: Bespin
-Url:   https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk
-
-# Here comes the paths of the needed tools to build a release
-# the path can be simple or as full path. Depends if you have your tool in PATH
-[Tools] 
-svn:    C:\Program Files (x86)\Subversion\svn.exe
-wget:   C:\Libs\FreeCADLibs\FreeCADLibs6.2\bin\wget.exe
-candle: C:\Libs\Libs\wix_30\candle.exe
-light:  C:\Libs\Libs\wix_30\light.exe
-hhc:    C:\Program Files (x86)\HTML Help Workshop\hhc.exe
-
-# needet until the build is completely done with cMake
-[Libs] # Libs used in the build
-FreecadLib: C:\Libs\FreeCADLibs\FreeCADLibs6.2
\ No newline at end of file
diff --git a/BuildRelease.py b/BuildRelease.py
deleted file mode 100644
index 554d5551fa..0000000000
--- a/BuildRelease.py
+++ /dev/null
@@ -1,342 +0,0 @@
-#! python
-# -*- coding: utf-8 -*-
-# (c) 2007 Jürgen Riegel  GPL
-
-Usage = """BuildRelease - Build script to build a complete FreeCAD release
-
-Usage:
-   BuildRelease [Optionen] ReleaseNbr
-   
-Options:
- -h, --help          print this help
- -b, --buildPath     specify the output path where the build takes place
- -i, --ini-file      specify the ini file to use
- 
-This script will build a complete FreeCAD distribution which includes:
-* Check out fresh source
-* packing source
-* Set the Version and Release numbers
-* Gathering change log
-* completele build FreeCAD
-* run tests
-* build source docu
-* build user docu
-* build installer
-* upload to source forge 
-   
-On failure of one of these steps the script will stop.
-Each step writes tones of info in the log file.
-There is one error log file.
-
-Autor:
-  (c) 2007 Juergen Riegel
-  juergen.riegel@web.de
-	Licence: GPL
-
-Version:
-  0.1
-"""
-#  
-# Its inteded only to used by the maintainer
-
-import os, sys, getopt
-from subprocess import call,Popen,PIPE
-from time import sleep
-from zipfile import ZipFile,ZIP_DEFLATED
-import tarfile
-from string import find
-import ConfigParser
-import time
-
-
-# global information 
-Release = 0
-Major = 0
-Minor = 7
-Alias = ""
-FileName = ""
-BuildPath = "D:/ReleaseBuilds"
-Log = None
-ErrLog = None
-Config = None
-
-
-def CallProcess(args,Msg,ret=True):
-	Anim = ['-','\\','|','/']
-	
-	sys.stdout.write(Msg+':  ')
-	Log.write("====== Call: " + args[0] + '\n')
-	SVN = Popen(args,
-	            stdout=PIPE, stderr = ErrLog)
-	
-	i = 0
-	while(SVN.poll() == None):
-		line = SVN.stdout.readline()
-		if(line):
-			Log.write(line.replace('\n',''))
-		sys.stdout.write(chr(8) + Anim[i%4])
-		i+=1
-		sleep(0.2)
-	
-	#ErrLog.write(SVN.stdout.read())
-	sys.stdout.write(chr(8) + "done\n")
-	if(not SVN.returncode == 0 and ret):
-		print "Process returns: ",SVN.returncode
-		raise
-
-# Step 2 & 3
-def CheckOut():
-	
-	CallProcess([Config.get('Tools','svn'), 
-	             "checkout",
-				 "-r",
-				 `Release`,
-				 "https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk",
-				 "../"+FileName],
-				 "2) Checking out")
-
-	sys.stdout.write('3) Write version files: ')
-	
-	Version = open("src/Build/Version.h","w")
-	Version.write('#define FCVersionMajor "' + `Major` + '"\n')
-	Version.write('#define FCVersionMinor "' + `Minor` + '"\n')
-	Version.write('#define FCVersionName "' + Alias + '"\n')
-	Version.write('#define FCRevision "' + `Release` + '"\n')
-	Version.write('#define FCRepositoryURL "' + "https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk/src" + '"\n')
-	Version.write('#define FCCurrentDateT  "'+time.asctime()+'"  \n')
-	Version.close()
-	
-	Version = open("installer/Version.wxi","w")
-	Version.write('<Include> \n')
-	Version.write('   <?define FCVersionMajor = ' + `Major` + ' ?>\n')
-	Version.write('   <?define FCVersionMinor = ' + `Minor` + ' ?>\n')
-	Version.write('   <?define FCVersionRevision =' + `Release` + ' ?>\n')
-	Version.write('   <?define FCVersionAlias = "' + Alias + '" ?>\n')
-	Version.write('</Include> \n')
-	Version.close()
-	
-	sys.stdout.write('done\n')
-
-
-#Step 4
-def PackSourceZip():
-
-	def addAll(dirFrom, ZipSrcFile):
-		for file in os.listdir(dirFrom):                      # for files/dirs here
-			if(not file==".svn" and not file== FileName+'_source.zip'):
-				pathFrom = os.path.join(dirFrom, file)
-				if not os.path.isdir(pathFrom):                   # copy simple files
-					ZipSrcFile.write(pathFrom,pathFrom.replace('.\\',FileName+'\\'))
-					Log.write("Insert: "+ pathFrom + '\n')
-				else:
-					addAll(pathFrom,ZipSrcFile)
-					
-	sys.stdout.write("4) Pack zip source files: ")
-	
-	SourceFile = ZipFile(FileName+'_source.zip','w',ZIP_DEFLATED,True)
-	addAll('.',SourceFile)
-	SourceFile.close()
-	
-	sys.stdout.write("done \n")
-
-# Step 5
-def PackSourceTar():
-
-	def addAll(dirFrom, ZipTarFile):
-		for file in os.listdir(dirFrom):                      # for files/dirs here
-			if(not file==".svn" and not file== FileName+'_source.zip'):
-				pathFrom = os.path.join(dirFrom, file)
-				if not os.path.isdir(pathFrom):                   # copy simple files
-					ZipTarFile.add(pathFrom,pathFrom.replace('.\\',FileName+'\\'))
-					Log.write("Insert: "+ pathFrom + '\n')
-				else:
-					addAll(pathFrom,ZipTarFile)
-					
-	sys.stdout.write("5) Pack tar source files: ")
-	
-	SourceFile = tarfile.open(FileName+'_source.tgz','w:gz')
-	addAll('.',SourceFile)
-	SourceFile.close()
-	
-	sys.stdout.write("done \n")
-
-
-# Step 6 & 7	
-def BuildAll():
-	import fcbt.FileTools
-	LibPack = Config.get('Libs','FreeCADLib')
-	
-	sys.stdout.write('6) Copy resources: ')
-	os.mkdir('./bin')
-	fcbt.FileTools.cpall(LibPack + '/bin','./bin')
-	os.mkdir('./include')
-	fcbt.FileTools.cpall(LibPack + '/include','./include')
-	os.mkdir('./lib')
-	fcbt.FileTools.cpall(LibPack + '/lib','./lib')
-	os.mkdir('./doc')
-	fcbt.FileTools.cpall(LibPack + '/doc','./doc')
-	sys.stdout.write('done\n')
-	
-	CallProcess(["BuildAll.bat"],
-				 "7) Build all")
-	
-# Step 8 & 9
-def HelpFile():
-	import wiki2chm
-	if not os.path.isdir('doc'):
-		os.mkdir('doc')
-	if not os.path.isdir('doc/tmp'):
-		os.mkdir('doc/tmp')
-		
-	CallProcess([Config.get('Tools','wget'),'-k', '-r', '-l5', '-P', 'doc/tmp', '-nd', 
-	            '-R', '*action=*',
-				'-R', '*title=Special*',
-				'-R', '*title=Talk*',
-				'-R', '*oldid=*',
-				'-R', '*printable=yes*',
-				'--domains=apps.sourceforge.net',
-				'--append-output=doc/tmp/wget.log',
-				'http://apps.sourceforge.net/mediawiki/free-cad/index.php?title=Online_Help_Toc'],
-				 "8) Download docu")
-
-	sys.stdout.write("9) Fix up CSS: ")
-	open('doc/tmp/chm.css','w').write(open('src/Tools/chm.css').read())
-	
-	wiki2chm.WikiBaseUrl ='http://apps.sourceforge.net/mediawiki/free-cad/'
-	wiki2chm.TocPageName ='Online_Help_Toc'
-	wiki2chm.BasePath ='doc/tmp/'
-	wiki2chm.Output = Log
-
-	wiki2chm.replaceCSS()
-	
-	wiki2chm.WriteProject()
-	wiki2chm.readToc()
-	sys.stdout.write("done \n")
-	
-# Step 10
-def CompileHelp():
-	import fcbt.FileTools
-	CallProcess([Config.get('Tools','hhc'),'doc/tmp/Online_Help_Toc.hhp'],'10)Compile help:',False)
-	fcbt.FileTools.cpfile('doc/tmp/FreeCAD.chm','doc/FreeCAD.chm')
-	fcbt.FileTools.cpfile('doc/tmp/FreeCAD.chm',FileName+'_helpfile.chm')
-
-def BuildInstaller():
-	import fcbt.FileTools
-	LibPack = Config.get('Libs','FreeCADLib')
-	
-	fcbt.FileTools.cpfile('lib/Microsoft_VC80_CRT_x86.msm','installer/Microsoft_VC80_CRT_x86.msm')
-	fcbt.FileTools.cpfile('lib/policy_8_0_Microsoft_VC80_CRT_x86.msm','installer/policy_8_0_Microsoft_VC80_CRT_x86.msm')
-	CallProcess([Config.get('Tools','candle'),
-				 '-out', 'installer\\',
-	             'installer\\FreeCAD.wxs',
-	             'installer\\FreeCADBase.wxs',
-	             'installer\\LibPack.wxs',
-	             'installer\\FreeCADDoc.wxs',
-	             'installer\\FreeCADModules.wxs',
-				 ],'11)Compile installer:',False) 
-	CallProcess([Config.get('Tools','light'),
-				 '-ext', 'WixUIExtension',
-				 '-cultures:en-us',
-				 '-out', 'installer\\FreeCAD.msi',
-	             'installer\\FreeCAD.wixobj',
-	             'installer\\FreeCADBase.wixobj',
-	             'installer\\LibPack.wixobj',
-	             'installer\\FreeCADDoc.wixobj',
-	             'installer\\FreeCADModules.wixobj',
-				 ],'12)Build installer:',False)
-				 
-	fcbt.FileTools.cpfile('installer/FreeCAD.msi',FileName+'_installer.msi')
-	
-def SendFTP():
-	from ftplib import FTP
-	ftp = FTP('upload.sf.net')
-	Log.write(ftp.login() + '\n')
-	Log.write(ftp.cwd("/incoming") + '\n')
-	Log.write(ftp.sendcmd('PASV') + '\n')
-	Log.write(ftp.sendcmd('TYPE I') + '\n')
-	sys.stdout.write('13) Send source ZIP: ')
-	f = open(FileName+'_source.zip', "r") 
-	Log.write(ftp.storbinary('STOR '+ FileName+'_source.zip', f)  + '\n')
-	sys.stdout.write('done\n14) Send source tgz: ')
-	f = open(FileName+'_source.tgz', "r") 
-	Log.write(ftp.storbinary('STOR '+ FileName+'_source.tgz', f)  + '\n')
-	sys.stdout.write('done\n15) Send installer: ')
-	f = open(FileName+'_installer.msi', "r") 
-	Log.write(ftp.storbinary('STOR '+ FileName+'_installer.msi', f)  + '\n')
-	f.close()
-	ftp.close()
-	
-def main():
-	global Release, Major, Minor, Alias, FileName, BuildPath, Log, ErrLog, Config
-	IniFile = "BuildRelease.ini"
-	try:
-		opts, args = getopt.getopt(sys.argv[1:], "hb:", ["help","buildPath="])
-	except getopt.GetoptError:
-		# print help information and exit:
-		sys.stderr.write(Usage)
-		sys.exit(2)
-
-	# checking on the options
-	for o, a in opts:
-		if o in ("-h", "--help"):
-			sys.stderr.write(Usage)
-			sys.exit()
-		if o in ("-b", "--buildPath"):
-			BuildPath = a
-		if o in ("-i", "--ini-file"):
-			IniFile = a
-
-
-	# runing through the files
-	if (not len(args) == 1):
-		sys.stderr.write(Usage)
-	
-	Release = int(args[0])
-	
-	Config = ConfigParser.ConfigParser()
-	Config.readfp(open(IniFile))
-	
-	Alias   = Config.get('Version','Alias')
-	Major   = Config.getint('Version','Major')
-	Minor   = Config.getint('Version','Minor')
-
-	# creating the directory and switch to
-	FileName = 'FreeCAD_' + `Major` + '.' + `Minor` + '.' + `Release`
-	print "=== Building:", FileName, '\n'
-	BuildPath = BuildPath + '/' + FileName
-	# set tool path 
-	sys.path.append((BuildPath + '/src/Tools') )
-	OldCwd = os.getcwd()
-	print "1) Creating Build directory: ", BuildPath
-	if not os.path.isdir(BuildPath):
-		os.mkdir(BuildPath)
-	os.chdir(BuildPath)
-	Log = open("BuildRelease.log","w")
-	ErrLog = open("BuildReleaseErrors.log","w")
-	
-	try:
-		CheckOut()
-		PackSourceZip()
-		PackSourceTar()
-		BuildAll()
-		HelpFile()
-		CompileHelp()
-		BuildInstaller()
-		#SendFTP()
-	except:
-		Log.close()
-		ErrLog.close()
-		Err = open("BuildReleaseErrors.log","r")
-		sys.stderr.write("!!!!!!!!! Fehler aufgetreten:\n")
-		sys.stderr.write(Err.read())
-		raise
-	
-	os.chdir(OldCwd)
-	Log.close()
-	ErrLog.close()
-
-	print "Press any key"
-	sys.stdin.readline()
-	
-if __name__ == "__main__":
-	main()
diff --git a/src/Tools/WixFileTool.py b/src/Tools/WixFileTool.py
deleted file mode 100644
index 9665354b43..0000000000
--- a/src/Tools/WixFileTool.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#! python
-# (c) 2005 Juergen Riegel LGPL
-
-Usage = """
-WIX file lister
-Usage:
-   WixFileTool [Optionen] srcDir destDir
-Optionen:
- 
-Author:
-  (c) 2005 Juergen Riegel
-  juergen.riegel@web.de
-
-Version:
-  0.1
-"""
-
-import os,sys,string,re,glob
-
-def ProcessDir(dummy,dirname,filesindir):
-  print dirname
-
-if __name__ == '__main__':
-  if(len(sys.argv) < 3):
-    sys.stdout.write(Usage)
-    sys.exit(1)
-  else:
-    i=0
-    for name in glob.glob(sys.argv[1]):
-      i=i+1
-      print "<File Id='DLL%d'    Name='ERR%d' LongName='%s' src='%s' DiskId='1' />" % (i,i,name,sys.argv[2])
-
-        
diff --git a/src/Tools/wiki2chm.py b/src/Tools/wiki2chm.py
deleted file mode 100644
index c8b179a263..0000000000
--- a/src/Tools/wiki2chm.py
+++ /dev/null
@@ -1,254 +0,0 @@
-#! python
-# -*- coding: utf-8 -*-
-# (c) 2007 Juergen Riegel LGPL
-
-Usage = """wiki2chm - connect to a wiki and spider the docu
-
-Usage:
-   wiki2chm [Options] WikiBaseUrl TocPageName
-   
-Options:
- -p, --proxy=ProxyUrl     specify a proxy
- -o  --out-path=BASEPATH  use this base path to the HTML project
- -h, --help               print this help
- -w, --wget-path=WGETPATH full path to wget (if not in system path)
- 
-Exit:
- 0      No Error or Warning found
- 1      Argument error, wrong or less Arguments given
- 2      Run delivers Warnings (printed on standard error)
- 10     Run stops with an error (printed on standard error)
- 
-This program reads the wiki and generates all necessary files
-to generate a .chm file.
-The TocPageName is a special page in the Wiki, which is used
-to generate the content for the .chm.
-
-Examples:
-  
-   wiki2chm  "http://juergen-riegel.net/FreeCAD/Docu/" Online_Help_Toc
-   wiki2chm  -w "C:/Libs/FreeCADLibs/FreeCADLibs6.1/bin/wget.exe" "http://juergen-riegel.net/FreeCAD/Docu/" Online_Help_Toc
- 
-Autor:
-  (c) 2007-2008 Juergen Riegel
-  mail@juergen-riegel.net	
-  Licence: GPL
-
-Version:
-  0.3
-"""
-
-import os,sys,string,re,getopt,codecs,binascii,datetime,urllib,glob,time
-
-
-# Globals
-Woff = 0
-
-proxies = {}
-WikiBaseUrl = ""
-TocPageName = ""
-FetchedArticels =[]
-BasePath = ""
-Wget = "wget"
-
-hhcHeader = """<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<UL>
-"""
-hhcFooter="""</UL>
-</BODY></HTML>
-"""
-ProjectFile = """
-[OPTIONS]
-Compatibility=1.1 or later
-Compiled file=FreeCAD.chm
-Contents file=Online_Help_Toc.hhc
-Default topic=index.php@title=Online_Help_Startpage
-Display compile progress=Yes
-Full-text search=Yes
-Language=0x409 Englisch (USA)
-[FILES]
-
-"""
-Output = sys.stdout
-
-def runWget():
-	global Wget
-	cmdLine = Wget + " "
-	cmdLine += "-k -r "    # convert to local links and do recursive
-	cmdLine += "-P tmp "   # write in this subdir
-	cmdLine += "-nd "      # flat (no subdirs)
-	cmdLine += "-l5 "      # max link follow depth
-	cmdLine += '-R "*action=*" '      # Reject all action links
-	cmdLine += '-R "*title=Special*" '# Reject all special pages
-	cmdLine += '-R "*title=Talk*" '   # Reject all Talk pages
-	cmdLine += '-R "*oldid=*" '       # Reject all history pages
-	cmdLine += '-R "*printable=yes*" '# Reject all print pages
-	cmdLine += 'http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Online_Help_Toc '
-	
-	result = os.popen(cmdLine).read()
-	print result
-	
-
-def getArticle(Name):
-	global proxies,WikiBaseUrl,TocPageName,BasePath
-	
-	url = WikiBaseUrl + 'index.php?title=' + Name.replace(" ","_") + '&printable=yes'
-	
-	print "GetFile: " + url
-	
-	urlFile = urllib.urlopen(url,proxies=proxies)
-	Article = urlFile.readlines()
-	file = open(BasePath + Name.replace(" ","_") + ".htm","w")
-	for i in Article:
-		i = i.replace("/FreeCAD/Docu/skins/common/commonPrint.css","test.css")
-		file.write(i)
-	file.close()
-
-def insertTocEntry(file,Indent,points,name,folder=0):
-	Output.write( "TocEntry:" + `Indent` + ' ' + name)
-	name = name.replace("\n","")
-	IndentStr = ""
-	for i in range(points):IndentStr += "   "
-
-	if(points > Indent):
-		for i in range(points-Indent):
-			file.write("<UL>")
-		file.write("\n")
-	if(points < Indent):
-		for i in range(Indent-points):
-			file.write("</UL>")
-		file.write("\n")
-	file.write(IndentStr + '<LI><OBJECT type="text/sitemap">\n')
-	file.write(IndentStr + '      <param name="Name" value="'+ name +'">\n')
-	if(not folder):
-		file.write(IndentStr + '      <param name="Local" value="index.php@title='+ name.replace(" ","_") + '">\n')
-	file.write(IndentStr + '   </OBJECT>\n')
-	return points
-	
-def readToc():
-	global proxies,WikiBaseUrl,TocPageName,BasePath
-	
-	url = WikiBaseUrl + 'index.php?title=Special:Export/' + TocPageName
-	Output.write( 'Open Toc url: ' + url + '\n')
-	urlFile = urllib.urlopen(url,proxies=proxies)
-	Toc = urlFile.readlines()
-	
-	# compile the regexes needed
-	Toc1 = re.compile("^(\*+)\s([\w|\s]*)")
-	Toc2 = re.compile("^(\*+)\s\[\[([\w|\s]*)\|([\w|\s]*)\]\]")
-	Toc3 = re.compile("^(\*+)\s\[\[([\w|\s]*)\\]\]")
-	
-	file = open(BasePath + TocPageName +".hhc","w")
-	file.write(hhcHeader)
-	ListIndent = 1
-	
-	for line in Toc:
-		#print line
-		TocMatch = Toc2.search(line);
-		if TocMatch:
-			#print "Match2: ", TocMatch.group(1),TocMatch.group(2),TocMatch.group(3)
-			#getArticle(TocMatch.group(2))
-			ListIndent = insertTocEntry(file,ListIndent,len(TocMatch.group(1)),TocMatch.group(2))
-			continue
-		TocMatch = Toc3.search(line);
-		if TocMatch:
-			#print "Match3: ", TocMatch.group(1),TocMatch.group(2)
-			#getArticle(TocMatch.group(2))
-			ListIndent = insertTocEntry(file,ListIndent,len(TocMatch.group(1)),TocMatch.group(2))
-			continue
-		TocMatch = Toc1.search(line);
-		if TocMatch:
-			#print "Match1: ", TocMatch.group(1),TocMatch.group(2)
-			ListIndent = insertTocEntry(file,ListIndent,len(TocMatch.group(1)),TocMatch.group(2),1)
-			continue
-	for i in range(ListIndent-1):
-		file.write("</UL>")
-	file.write("\n")
-
-	file.write(hhcFooter)
-
-def WriteProject():
-	global proxies,WikiBaseUrl,TocPageName,BasePath
-	
-	file = open(BasePath + TocPageName +".hhp","w")
-	file.write(ProjectFile)
-	
-	for FileEntry in os.listdir(BasePath) :
-		if(not FileEntry == TocPageName +".hhp"):
-			file.write(FileEntry + '\n')
-	
-	file.close()
-	
-def replaceCSS():
-	paths = glob.glob(BasePath + 'index.php*')
-	for file in paths:
-		Output.write( "Replace: " +file + '\n')
-		input = open(file,'r')
-		output = open(file + '_temp','w')
-		for l in input:
-			output.write(l.replace('"/FreeCAD/Docu/skins/monobook/main.css?9"','"chm.css"'))
-		output.close()
-		input.close()
-		time.sleep(0.2)
-		os.remove(file)
-		time.sleep(0.2)
-		os.rename(file + '_temp',file)
-		
-def main():
-	global proxies,WikiBaseUrl,TocPageName,BasePath, Wget
-	Proxy = ""
-	Qout = None
-	DFQout = None
-	CSVout = None
-	NoOut  = 0
-	
-	try:
-		opts, args = getopt.getopt(sys.argv[1:], "hw:p:o:", ["help", "weget-path=",  "proxy=","out-path="])
-	except getopt.GetoptError:
-		# print help information and exit:
-		sys.stderr.write(Usage)
-		sys.exit(2)
-
-	# checking on the options
-	for o, a in opts:
-		if o == "-v":
-			verbose = True
-		if o in ("-h", "--help"):
-			sys.stderr.write(Usage)
-			sys.exit()
-		if o in ("-w", "--weget-path"):
-			Wget = a
-		if o in ("-p", "--proxy"):
-			Proxy = a
-		if o in ("-o", "--out-path"):
-			print "Using output path: " + a +"\n"
-			BasePath = a
-
-	# runing through the files
-	if(Proxy == ""):
-		proxies = {}
-		print 'Using no proxy'
-	else:
-		proxies = {'http':Proxy}
-		print 'Using proxy: ' + Proxy
-
-	if (len(args) !=2):
-		sys.stderr.write("Wrong number of arguments!\n\n")
-		sys.stderr.write(Usage)
-		sys.exit(2)
-	else:
-		WikiBaseUrl = args[0]
-		TocPageName = args[1]
-		runWget()
-		readToc()
-		WriteProject()
-		
-
-
-if __name__ == "__main__":
-	main()
diff --git a/src/WindowsInstaller/BuildInstaller.bat b/src/WindowsInstaller/BuildInstaller.bat
deleted file mode 100644
index 04fc554c77..0000000000
--- a/src/WindowsInstaller/BuildInstaller.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-
-if NOT DEFINED WIXDIR set WIXDIR=C:\Program Files (x86)\Windows Installer XML v3
-
-rem in order to build an x64 installer set PLATFORM to x64 
-if not defined PLATFORM set PLATFORM=x86
-
-C:\Python26\python.exe ../Tools/WinVersion.py --dir=../.. --src=Version.wxi.in --out=Version.wxi
-C:\Python26\python.exe ../Tools/WinVersion.py --dir=../.. --src=CopyRelease.bat.in --out=CopyRelease.bat
-C:\Python26\python.exe ../Tools/WinVersion.py --dir=../.. --src=../Build/Version.h.in   --out=../Build/Version.h
-rem "C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. Version.wxi.in Version.wxi
-rem "C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. CopyRelease.bat.in CopyRelease.bat
-rem "C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. ..\Build\Version.h.in ..\Build\Version.h
-
-SET /P M=Reebuild and press enter 
-
-"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADBase.wxobj    FreeCADBase.wxs
-"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out LibPack.wxobj        LibPack.wxs
-"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADDoc.wxobj     FreeCADDoc.wxs
-"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADModules.wxobj FreeCADModules.wxs
-"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADData.wxobj    FreeCADData.wxs
-"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCAD.wxobj        FreeCAD.wxs
-
-"%WIXDIR%\bin\light.exe"  -dWixUIBannerBmp=Bitmaps/BanerBitmap.bmp -dWixUIDialogBmp=Bitmaps/BackgroundBitmap.bmp -ext WixUIExtension -sice:ICE03 -sice:ICE60 -sice:ICE82 -sice:ICE83 -cultures:en-us -out FreeCAD.msi *.wxobj 
-
-rem making of the bin zip file
-
-"%PROGRAMFILES%\7-Zip\7z.exe" a -t7z FreeCAD.7z "-xr!*.idb" "-xr!*.pdb" "-xr!*.ilk" "-xr!*.pyc" "-xr!?.git\*" "-xr!*.am" "-xr!CMakeFiles" "..\..\bin" "..\..\Mod" "..\..\Doc" "..\..\data"
-
-call CopyRelease.bat
-
-del FreeCAD.7z
-del FreeCAD.msi
\ No newline at end of file
diff --git a/src/WindowsInstaller/BuildRelease.bat b/src/WindowsInstaller/BuildRelease.bat
deleted file mode 100644
index 4e8820fde8..0000000000
--- a/src/WindowsInstaller/BuildRelease.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-
-rem set up Version Number
-call ..\src\Build\BuildVersion.bat
-
-rem Build FreeCAD
-call ..\BuildAll.bat
-
-rem installer
-call BuildInstaller.bat
-
-@pause
-
-
diff --git a/src/WindowsInstaller/CopyRelease.bat.in b/src/WindowsInstaller/CopyRelease.bat.in
deleted file mode 100644
index 91d6e23308..0000000000
--- a/src/WindowsInstaller/CopyRelease.bat.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-copy FreeCAD.msi FreeCAD_0.14.$WCREV$_x86_RC_setup.msi
-copy FreeCAD.7z  FreeCAD_0.14.$WCREV$_x86_RC_bin.7z
\ No newline at end of file
diff --git a/src/WindowsInstaller/FreeCAD.wxs b/src/WindowsInstaller/FreeCAD.wxs
deleted file mode 100644
index 1009899f3f..0000000000
--- a/src/WindowsInstaller/FreeCAD.wxs
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                 
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<?include Version.wxi ?>
-	<?define RTMProductVersion="$(var.FCVersionMajor).$(var.FCVersionMinor)" ?>
-	<?define ProductVersion="$(var.FCVersionMajor).$(var.FCVersionMinor).$(var.FCVersionRevision)" ?>
-	<!-- this is the product UID and have to change for every x.y Version  -->
-	<?define ProductCode="{C3E556CE-88FC-423f-8063-D65F81143E28}"?>
-	<!-- this is the product upgrade UID and have to change for every x.y Version  -->
-	<?define UpgradeCode="{C3E556CE-88FC-423f-8063-D65F81143E28}"?>
-	<?define PackageCode="{????????-????-????-????-????????????}"?>
-
-
-	<Product Id='$(var.ProductCode)' 
-				UpgradeCode='$(var.UpgradeCode)' 
-				Name="FreeCAD $(var.FCVersionMajor).$(var.FCVersionMinor)" 
-				Language="1033" 
-				Version='$(var.ProductVersion)' 
-				Manufacturer="Juergen Riegel (FreeCAD@juergen-riegel.net)">
-        <Package Description="FreeCAD $(var.FCVersionMajor).$(var.FCVersionMinor) Installer package" 
-				Comments="for details about FreeCAD see http://www.freecadweb.org" 
-				InstallerVersion="300" 
-				Compressed="yes"
-				AdminImage='no'
-				Platform='$(var.ProcessorArchitecture)'
-				ReadOnly='yes'
-				Keywords='FreeCAD,Installer,MSI' />
-
-		<Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
-		<Upgrade Id="$(var.UpgradeCode)">
-			<UpgradeVersion Minimum="$(var.ProductVersion)"
-							IncludeMinimum="no"
-							OnlyDetect="yes"
-							Language="1033"
-							Property="NEWPRODUCTFOUND" />
-			<UpgradeVersion Minimum="$(var.RTMProductVersion)"
-							IncludeMinimum="yes"
-							Maximum="$(var.ProductVersion)"
-							IncludeMaximum="no"
-							Language="1033"
-							Property="UPGRADEFOUND" />
-		</Upgrade>
-
-		<Property Id="ARPCOMMENTS">Greatest CAD ever ;-)</Property>
-		<Property Id="ARPCONTACT">Juergen Riegel (FreeCAD@juergen-riegel.net)</Property>
-		<Property Id="ARPHELPLINK">http://sourceforge.net/forum/forum.php?forum_id=161659</Property>
-		<Property Id="ARPURLINFOABOUT">http://www.freecadweb.org/</Property>
-		<Property Id="ARPURLUPDATEINFO">https://sourceforge.net/projects/free-cad/files/</Property>
-		<Property Id="ALLUSERS">1</Property>
-
-		<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
-
-
-        <Directory Id="TARGETDIR" Name="SourceDir">
- 			<!-- These installs the Visual C++ 9.0 Runtime Libraries -->
-			<?if $(var.ProcessorArchitecture)=x64 ?>
-			<Merge  Id="CRT" Language="0" SourceFile='$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm' DiskId="1"/>
-			<?else ?>
-			<Merge  Id="CRT" Language="0" SourceFile='$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm' DiskId="1"/>
-			<?endif ?>
-			
-			<?if $(var.ProcessorArchitecture)=x64 ?>
-			<Directory Id="ProgramFiles64Folder" Name="PFiles">
-                <Directory Id="INSTALLDIR" Name="FreeCAD$(var.FCVersionMajor).$(var.FCVersionMinor)">
-                    <Directory Id="BinDir"  Name="bin" />
-                    <Directory Id="ModDir"  Name="Mod" />
-                    <Directory Id="DocDir"  Name="doc" />
-					<Directory Id="DataDir" Name="data" />
-                </Directory>
-            </Directory>
-			<?else ?>
-			<Directory Id="ProgramFilesFolder" Name="PFiles">
-                <Directory Id="INSTALLDIR" Name="FreeCAD$(var.FCVersionMajor).$(var.FCVersionMinor)">
-                    <Directory Id="BinDir"  Name="bin" />
-                    <Directory Id="ModDir"  Name="Mod" />
-                    <Directory Id="DocDir"  Name="doc" />
-					<Directory Id="DataDir" Name="data" />
-                </Directory>
-            </Directory>
-			<?endif ?>
-            <Directory Id="ProgramMenuFolder">
-                <Directory Id="MenuDir" Name="FreeCAD $(var.FCVersionMajor).$(var.FCVersionMinor)" />
-            </Directory>
-            <Directory Id="DesktopFolder" Name="Desktop" />
-        </Directory>
-        <Feature Id="Complete" 
-				Title="FreeCAD $(var.FCVersionMajor).$(var.FCVersionMinor)" 
-				Description="The Base system and standard modules" 
-				Display="expand" 
-				Level="1" 
-				Absent="disallow" 
-				ConfigurableDirectory="INSTALLDIR">
-            <MergeRef Id="CRT" />
-            <ComponentRef Id="Base" />
-            <ComponentRef Id="BaseCmd" />
-            <ComponentRef Id="BaseShortcuts" />
-            <ComponentRef Id="BaseCmdShortcuts" />
-            <ComponentRef Id="LibPackBinaries" />
-            <ComponentRef Id="PyQtTop" />
-            <ComponentRef Id="PyQtUic" />
-            <ComponentRef Id="PyQtCompiler" />
-            <ComponentRef Id="PyQtLoader" />
-            <ComponentRef Id="PyQtWidgetPlugins" />
-			<!--            
-			<ComponentRef Id="PyQtQwt5" />
-			-->
-            <ComponentRef Id="PivyGui" />
-            <ComponentRef Id="PivyTop" />
-            <ComponentRef Id="ImageForm" />
-            <ComponentRef Id="accessible" />
-            <ComponentRef Id="codecs" />
-            <ComponentRef Id="iconengines" />
-            <ComponentRef Id="sqldrivers" />
-            <ComponentRef Id="CompModPart" />
-            <ComponentRef Id="CompModMesh" />
-            <ComponentRef Id="CompModPoints" />
-            <ComponentRef Id="CompModComplete" />
-            <ComponentRef Id="CompModMeshPart" />
-            <ComponentRef Id="CompModFem" />
-            <ComponentRef Id="CompModPartDesign" />
-            <ComponentRef Id="CompModPartDesignScripts" />
-            <ComponentRef Id="CompModSketcher" />
-            <ComponentRef Id="CompModDraft" />
-            <ComponentRef Id="CompModTest" />
-            <ComponentRef Id="CompModInspection" />
-            <ComponentRef Id="CompModImport" />
-            <ComponentRef Id="CompModArch" />
-			<!-- No CAM at the moment 
-            <ComponentRef Id="CompModCam" />
-			-->
-            <ComponentRef Id="CompModDrawingTemplates" />
-            <ComponentRef Id="CompModDrawing" />
-            <ComponentRef Id="CompModRaytracingTemplates" />
-            <ComponentRef Id="CompModRobot" />
-            <ComponentRef Id="CompModRobotLibKuka" />
-            <ComponentRef Id="CompModStart" />
-            <ComponentRef Id="CompModStartLibStartPage" />
-            <ComponentRef Id="CompModStartDataStartPage" />
-            <ComponentRef Id="CompModWeb" />
-            <ComponentRef Id="CompModOpenSCAD" />
-            <ComponentRef Id="CompModOpenSCADPly" />
-            <!-- Ship module -->
-            <ComponentRef Id="CompModShip" />
-            <ComponentRef Id="CompModShipExamples" />
-            <ComponentRef Id="CompModShipIcons" />
-            <ComponentRef Id="CompModShipOpenCL" />
-            <ComponentRef Id="CompModshipAreasCurve" />
-            <ComponentRef Id="CompModshipCreateShip" />
-            <ComponentRef Id="CompModshipHydrostatics" />
-            <ComponentRef Id="CompModshipLoadExample" />
-            <ComponentRef Id="CompModshipOutlineDraw" />
-            <ComponentRef Id="CompModshipUtils" />
-            <ComponentRef Id="CompModsimCreate" />
-            <ComponentRef Id="CompModsimPost" />
-            <ComponentRef Id="CompModsimRun" />
-            <ComponentRef Id="CompModsimRunCL" />
-            <ComponentRef Id="CompModsimRunNoCL" />
-            <ComponentRef Id="CompModtankCreateTank" />
-            <ComponentRef Id="CompModtankGZ" />
-            <ComponentRef Id="CompModtankWeights" />
-            <!-- Ship module -->
-            <ComponentRef Id="CompExampleData" />
-            <!-- Plot module -->
-            <ComponentRef Id="CompModPlot" />
-            <ComponentRef Id="CompModplotAxes" />
-            <ComponentRef Id="CompModplotLabels" />
-            <ComponentRef Id="CompModplotPositions" />
-            <ComponentRef Id="CompModplotSave" />
-            <ComponentRef Id="CompModplotSeries" />
-            <ComponentRef Id="CompModplotUtils" />
-		
-            <Feature Id="FeatModImage" Title="The Image module" Description="Module to handle pictures" Level="1">
-                <ComponentRef Id="CompModImage" />
-            </Feature>
-            <Feature Id="FeatModRaytracing" Title="The Raytracing module" Description="Module to work with the popular PovRay raytracer. (Experimental)" Level="1">
-                <ComponentRef Id="CompModRaytracing" />
-            </Feature>
-
-            <Feature Id="Documentation" Title="Documentation" Description="The manuals." Level="1">
-                <ComponentRef Id="DocComp" />
-            </Feature>
-						
-						
-        </Feature>
-
-		<Icon Id="FreeCADIcon" SourceFile="../../bin/FreeCAD.exe" />
-        <Property Id="ARPPRODUCTICON">FreeCADIcon</Property>
-        <UIRef Id="WixUI_Mondo" />
-		
-		<!-- Prevent downgrading -->
-		<CustomAction Id="PreventDowngrading" Error="Newer version already installed." />
-		<!-- Sequences -->
-		<InstallExecuteSequence>
-			<Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
-			<RemoveExistingProducts After="InstallFinalize" />
-		</InstallExecuteSequence>
-		<InstallUISequence>
-			<Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
-		</InstallUISequence>
-
-    </Product>
-</Wix>
diff --git a/src/WindowsInstaller/FreeCADBase.wxs b/src/WindowsInstaller/FreeCADBase.wxs
deleted file mode 100644
index 4209becc53..0000000000
--- a/src/WindowsInstaller/FreeCADBase.wxs
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                 
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment Id="FreeCADBase">
-		<!-- Add the 64-bit registry component to the 64-bit MSI, and add the 32-bit registry        -->
-		<!-- component to the 32-bit MSI.                                                            -->
-		<?if $(var.ProcessorArchitecture)=x64 ?>
-		<?define Win_64 = "yes" ?>
-		<?else ?>
-		<?define Win_64 = "no" ?>
-		<?endif ?>
-		<DirectoryRef Id="BinDir" FileSource="../../bin/">
-			<Component Id="Base" Guid="0EBBDFE7-9FD5-4b2c-BD12-6728D094C6F7" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="Exe" Name="FreeCAD.exe" />
-				<File Id="GuiDll"   Name="FreeCADGui.dll"  />
-				<File Id="GuiPyd"   Name="FreeCADGui.pyd"  />
-			</Component>
-			<Component Id="BaseCmd" Guid="0EBBDFE7-9FD5-4b2c-BD12-6728D094C6F8" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="CmdExe" Name="FreeCADCmd.exe"/>
-				<File Id="PyModule" Name="FreeCAD.pyd"     />
-				<File Id="AppDll"   Name="FreeCADApp.dll"  />
-				<File Id="BaseDll"  Name="FreeCADBase.dll" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="MenuDir" >
-			<Component Id="BaseShortcuts" Guid="06974300-02a5-11df-8a39-0800200c9a66" Win64='$(var.Win_64)'>
-				<Shortcut Id="FCShortcut" 
-						Name="FreeCAD" 
-						Icon="FreeCADIcon.exe"
-						Description="FreeCAD gui version" 
-						Target = "[BinDir]FreeCAD.exe"
-						WorkingDirectory="BinDir" >
-						<Icon Id="FreeCADIcon.exe" SourceFile="../../bin/FreeCAD.exe" /> 
-						
-				</Shortcut>
-				<RegistryValue 
-					Root="HKCU" 
-					Key="Software\Microsoft\FreeCAD" 
-					Name="installed"
-					Type="integer" 
-					Value="1" 
-					KeyPath="yes"/>
-			</Component>
-			<Component Id="BaseCmdShortcuts" Guid="f29d51e0-02a5-11df-8a39-0800200c9a66" Win64='$(var.Win_64)'>
-				<Shortcut Id="FCCmdShortcut" 
-						Name="command line" 
-						Icon="FreeCADCMDIcon.exe"
-						Description="FreeCAD command line version" 
-						Target = "[BinDir]FreeCADCmd.exe"
-						WorkingDirectory="BinDir" >
-						<Icon Id="FreeCADCMDIcon.exe"
-					          SourceFile="../../bin/FreeCADCmd.exe" />
-				</Shortcut>
-				<RegistryValue 
-					Root="HKCU" 
-					Key="Software\Microsoft\FreeCADCmd" 
-					Name="installed" 
-					Type="integer" 
-					Value="1" 
-					KeyPath="yes"/>
-				<RemoveFolder Id="RmvMenuFolder" Directory="MenuDir" On="uninstall"/>
-			</Component>
-		</DirectoryRef>
-	</Fragment>
-</Wix>
diff --git a/src/WindowsInstaller/FreeCADData.wxs b/src/WindowsInstaller/FreeCADData.wxs
deleted file mode 100644
index d612951df7..0000000000
--- a/src/WindowsInstaller/FreeCADData.wxs
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2011                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2011                                                 
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment Id="FreeCADData">
-		<!-- Add the 64-bit registry component to the 64-bit MSI, and add the 32-bit registry        -->
-		<!-- component to the 32-bit MSI.                                                            -->
-		<?if $(var.ProcessorArchitecture)=x64 ?>
-		<?define Win_64 = "yes" ?>
-		<?else ?>
-		<?define Win_64 = "no" ?>
-		<?endif ?>
-		<DirectoryRef Id="DataDir">
-			<!-- Data file -->
-			<Directory Id="ExamplesDir" Name="examples" FileSource="../../data/examples">
-				<Component Id="CompExampleData"  Guid="63150a20-864a-11e0-9d78-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="ExampleFile1" Name="DrawingExample.FCStd"   />
-					<File Id="ExampleFile2" Name="PartDesignExample.FCStd"   />
-					<File Id="ExampleFile3" Name="RobotExample.FCStd"   />
-					<File Id="ExampleFile4" Name="Schenkel.stp"   />
-                    <File Id="ExampleFile5" Name="ArchDetail.FCStd" />
-				</Component>
-			</Directory>
-			<Directory Id="DataMod" Name="Mod" FileSource="../../data/Mod" >
-				<!-- Robot resource files  -->
-				<Directory Id="DataModRobot" Name="Robot" FileSource="../../data/Mod/Robot" >
-					<Directory Id="ModRobotLib" Name="Lib" FileSource="../../data/Mod/Robot/Lib" >
-						<Directory Id="ModRobotLibKuka" Name="Kuka" FileSource="../../data/Mod/Robot/Lib/Kuka" >
-							<Component Id="CompModRobotLibKuka"  Guid="753d2cc0-02af-11df-8a39-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-								<File Id="Kuka1" Name="kr16.wrl"   />
-								<File Id="Kuka2" Name="kr210.WRL"   />
-								<File Id="Kuka3" Name="kr500_1.csv"   />
-								<File Id="Kuka4" Name="kr500_1.wrl"   />
-								<File Id="Kuka5" Name="kr_16.csv"   />
-								<File Id="Kuka6" Name="kr_210_2.csv"   />
-								<File Id="Kuka7" Name="kr_125.csv"   />
-								<File Id="Kuka8" Name="kr125_3.wrl"   />
-							</Component>
-						</Directory>
-					</Directory>
-				</Directory>
-				<!-- Drawing resource files  -->
-				<Directory Id="DataModDraw" Name="Drawing" FileSource="../../data/Mod/Drawing" >
-					<Directory Id="ModDrawingTemplates" Name="Templates" FileSource="../../data/Mod/Drawing/Templates">
-						<Component Id="CompModDrawingTemplates" Guid="f879f473-3a2a-4808-8fa0-021b4a7db30b" Win64='$(var.Win_64)' KeyPath="yes">
-							<File Id="DrawingTemplateA3" Name="A3_Landscape.svg"  />
-						</Component>
-					</Directory>
-				</Directory>
-				<!-- Raytracing resource files  -->
-				<Directory Id="DataModRay" Name="Raytracing" FileSource="../../data/Mod/Raytracing" >
-					<Directory Id="ModRaytracingTemplates" Name="Templates" FileSource="../../data/Mod/Raytracing/Templates">
-						<Component Id="CompModRaytracingTemplates" Guid="C0319A8E-7B29-428a-84B7-4A84DB44ABD3" Win64='$(var.Win_64)' KeyPath="yes">
-							<File Id="ProjectStd" Name="ProjectStd.pov"  />
-							<File Id="RadiosityNormal" Name="RadiosityNormal.pov"  />
-							<File Id="RadiosityOutdoorHQ" Name="RadiosityOutdoorHQ.pov"  />
-                            <File Id="LuxClassic" Name="LuxClassic.lxs"  />
-                            <File Id="LuxOutdoor" Name="LuxOutdoor.lxs"  />
-						</Component>
-					</Directory>
-				</Directory>
-				<!-- StartPage resource files  -->
-				<Directory Id="DataModStart" Name="Start" FileSource="../../data/Mod/Start" >
-					<Directory Id="ModStartDataStartPage" Name="StartPage" FileSource="../../data/Mod/Start/StartPage" >
-						<Component Id="CompModStartDataStartPage"  Guid="aa63eb2a-9355-4d6e-872c-e2fdf9c697da" Win64='$(var.Win_64)' KeyPath="yes">
-							<File Id="StartPage2" Name="PartDesign.py"   />
-							<File Id="StartPage3" Name="Mesh.py"   />
-							<File Id="StartPage4" Name="LoadSchenkel.py"   />
-							<File Id="StartPage5" Name="LoadRobotExample.py"   />
-							<File Id="StartPage6" Name="LoadPartDesignExample.py"   />
-							<File Id="StartPage7" Name="LoadDrawingExample.py"   />
-							<!--<File Id="StartPage8" Name="Banner.jpeg"   />-->
-							<File Id="StartPage9" Name="Background.jpg"   />
-							<File Id="StartPage10" Name="Complete.png"   />
-							<File Id="StartPage11" Name="FreeCAD.png"   />
-							<File Id="StartPage12" Name="Mesh.png"   />
-							<File Id="StartPage13" Name="PartDesign.png"   />
-							<File Id="StartPage14" Name="PartDesignExample.png"   />
-							<File Id="StartPage15" Name="web.png"   />
-							<File Id="StartPage17" Name="ArchDesign.png"   />
-							<File Id="StartPage18" Name="ArchDesign.py"   />
-							<File Id="StartPage19" Name="DefaultWorkbench.py"   />
-							<File Id="StartPage20" Name="LoadMRU0.py"   />
-							<File Id="StartPage21" Name="LoadMRU1.py"   />
-							<File Id="StartPage22" Name="LoadMRU2.py"   />
-							<File Id="StartPage23" Name="ArchExample.png"   />
-                            <File Id="StartPage24" Name="ShipExample.png"   />
-                            <File Id="StartPage25" Name="Ship.png"   />
-                            <File Id="StartPage26" Name="Ship.py"   />
-                            <File Id="StartPage27" Name="LoadArchExample.py" />
-						</Component>
-					</Directory>
-				</Directory>
-			</Directory>
-		</DirectoryRef>
-	</Fragment>
-</Wix>
diff --git a/src/WindowsInstaller/FreeCADDoc.wxs b/src/WindowsInstaller/FreeCADDoc.wxs
deleted file mode 100644
index 819e3044aa..0000000000
--- a/src/WindowsInstaller/FreeCADDoc.wxs
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                 
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment Id="FreeCADDoc">
-        <DirectoryRef Id="DocDir" FileSource="../../doc">
-			<!-- Add the 64-bit registry component to the 64-bit MSI, and add the 32-bit registry        -->
-			<!-- component to the 32-bit MSI.                                                            -->
-			<?if $(var.ProcessorArchitecture)=x64 ?>
-			<?define Win_64 = "yes" ?>
-			<?else ?>
-			<?define Win_64 = "no" ?>
-			<?endif ?>
-            <Component Id="DocComp" Guid="8A17000C-47B0-46f7-9C17-10BC167580ED" Win64='$(var.Win_64)' KeyPath="yes">
-                <File Id="DocFreeCAD" Name="FreeCAD.qch" DiskId="1" />
-                <File Id="DocFreeCADc" Name="freecad.qhc" DiskId="1" />
-                <File Id="DocStartPage" Name="Start_Page.html" DiskId="1"/>
-            </Component>
-        </DirectoryRef>
-    </Fragment>
-</Wix>
diff --git a/src/WindowsInstaller/FreeCADModules.wxs b/src/WindowsInstaller/FreeCADModules.wxs
deleted file mode 100644
index e0698d53d0..0000000000
--- a/src/WindowsInstaller/FreeCADModules.wxs
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                 
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment Id="FreeCADModules">
-		<!-- Add the 64-bit registry component to the 64-bit MSI, and add the 32-bit registry        -->
-		<!-- component to the 32-bit MSI.                                                            -->
-		<?if $(var.ProcessorArchitecture)=x64 ?>
-		<?define Win_64 = "yes" ?>
-		<?else ?>
-		<?define Win_64 = "no" ?>
-		<?endif ?>
-        <DirectoryRef Id="ModDir">
-            <?include ModMesh.wxi ?>
-            <?include ModPart.wxi ?>
-			<?include ModSketcher.wxi ?>
-            <?include ModPoints.wxi ?>
-            <?include ModImage.wxi ?>
-            <?include ModRaytracing.wxi ?>
-            <?include ModTest.wxi ?>
-            <!--include ModCam.wxi ?-->
-            <?include ModComplete.wxi ?>
-            <?include ModMeshPart.wxi ?>
-            <?include ModFem.wxi ?>
-            <?include ModPartDesign.wxi ?>
-            <?include ModDrawing.wxi ?>
-            <?include ModDraft.wxi ?>
-            <?include ModRobot.wxi ?>
-            <?include ModInspection.wxi ?>
-            <?include ModImport.wxi ?>
-            <?include ModStart.wxi ?>
-            <?include ModWeb.wxi ?>
-            <?include ModArch.wxi ?>
-            <?include ModOpenSCAD.wxi ?>
-            <?include ModShip.wxi ?>
-            <?include ModPlot.wxi ?>
-        </DirectoryRef>
-    </Fragment>
-</Wix>
diff --git a/src/WindowsInstaller/LibPack.wxs b/src/WindowsInstaller/LibPack.wxs
deleted file mode 100644
index 007f69a338..0000000000
--- a/src/WindowsInstaller/LibPack.wxs
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                 
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment Id="LibPack">
-		<DirectoryRef Id="BinDir" FileSource="../../bin/">
-			<!-- Add the 64-bit registry component to the 64-bit MSI, and add the 32-bit registry        -->
-			<!-- component to the 32-bit MSI.                                                            -->
-			<?if $(var.ProcessorArchitecture)=x64 ?>
-			<?define Win_64 = "yes" ?>
-			<?else ?>
-			<?define Win_64 = "no" ?>
-			<?endif ?>
-			<Component Id="LibPackBinaries" Guid="515D7157-403B-4085-AC2F-0DC95A47F2D4" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="PythonExe" Name="python.exe">
-<!--					<Shortcut Id="PythonShortcut" 
-						Directory="MenuDir" 
-						Name="Python console" 
-						Icon="PythonIcon.exe"
-						Description="Starts directly the python console" 
-						WorkingDirectory="BinDir"
-						Advertise="no" >
-						<Icon Id="PythonIcon.exe"
-					          SourceFile="../../bin/python.exe" />
-					</Shortcut>-->
-
-				</File>
-				<!-- LibPack for x64 uses some newer library versions -->
-				<?if $(var.ProcessorArchitecture)=x64 ?>
-				<File Id="LibPack1" Name="boost_date_time-vc90-mt-1_41.dll" />
-				<File Id="LibPack2" Name="boost_filesystem-vc90-mt-1_41.dll" />
-				<File Id="LibPack3" Name="boost_iostreams-vc90-mt-1_41.dll" />
-				<File Id="LibPack4" Name="boost_program_options-vc90-mt-1_41.dll" />
-				<File Id="LibPack5" Name="boost_regex-vc90-mt-1_41.dll"  />
-				<File Id="LibPack6" Name="boost_serialization-vc90-mt-1_41.dll"  />
-				<File Id="LibPack7" Name="boost_signals-vc90-mt-1_41.dll"  />
-				<File Id="LibPack8" Name="boost_thread-vc90-mt-1_41.dll" />
-				<File Id="LibPack9" Name="boost_wserialization-vc90-mt-1_41.dll"  />
-				<File Id="LibPack11" Name="boost_system-vc90-mt-1_41.dll"  />
-				<?else ?>
-				<File Id="LibPack1" Name="boost_date_time-vc90-mt-1_48.dll" />
-				<File Id="LibPack2" Name="boost_filesystem-vc90-mt-1_48.dll" />
-				<File Id="LibPack3" Name="boost_iostreams-vc90-mt-1_48.dll" />
-				<File Id="LibPack4" Name="boost_program_options-vc90-mt-1_48.dll" />
-				<File Id="LibPack5" Name="boost_regex-vc90-mt-1_48.dll"  />
-				<File Id="LibPack6" Name="boost_serialization-vc90-mt-1_48.dll"  />
-				<File Id="LibPack7" Name="boost_signals-vc90-mt-1_48.dll"  />
-				<File Id="LibPack8" Name="boost_thread-vc90-mt-1_48.dll" />
-				<File Id="LibPack9" Name="boost_wserialization-vc90-mt-1_48.dll"  />
-				<File Id="LibPack11" Name="boost_system-vc90-mt-1_48.dll"  />
-				<?endif ?>
-				<File Id="LibPack10" Name="sip.pyd"  />
-                <File Id="LibPack15" Name="pyexpat.pyd"  />
-                <File Id="LibPack16" Name="select.pyd"   />
-                <File Id="LibPack17" Name="unicodedata.pyd"   />
-                <File Id="LibPack18" Name="winsound.pyd"   />
-				<!-- No libs for CAM at the moment 
-				<File Id="LibPack11" Name="atlas.dll"  />
-				<File Id="LibPack12" Name="ANN.dll"  />
-				-->
-				<File Id="LibPack13" Name="coin3.dll"  />
-				<!-- <File Id="LibPack20" Name="libumfpack.dll"  /> -->
-				<File Id="LibPack25" Name="_socket.pyd"   />
-				<File Id="LibPack26" Name="python26.dll"   />
-				<File Id="LibPack27" Name="python26.zip"   />
-				<File Id="LibPack29" Name="soqt1.dll"   />
-				<File Id="LibPack41" Name="QtCore4.dll"   />
-				<File Id="LibPack42" Name="QtDesigner4.dll"   />
-				<File Id="LibPack43" Name="QtDesignerComponents4.dll"   />
-				<File Id="LibPack44" Name="QtGui4.dll"   />
-				<File Id="LibPack45" Name="QtNetwork4.dll"   />
-				<File Id="LibPack46" Name="QtOpenGL4.dll"   />
-				<File Id="LibPack47" Name="QtSql4.dll"   />
-				<File Id="LibPack48" Name="QtSvg4.dll"   />
-				<File Id="LibPack49" Name="QtTest4.dll"   />
-				<File Id="LibPack50" Name="QtXml4.dll"   />
-				<File Id="LibPack51" Name="QtWebKit4.dll"   />
-				<File Id="LibPack55" Name="QtHelp4.dll"   />
-				<File Id="LibPack56" Name="QtCLucene4.dll"   />
-				<File Id="LibPack52" Name="phonon4.dll"   />
-				<File Id="LibPack54" Name="assistant.exe"   />
-				<File Id="LibPack61" Name="TKBO.dll"   />
-				<File Id="LibPack62" Name="TKBool.dll"   />
-				<File Id="LibPack63" Name="TKBRep.dll"   />
-				<File Id="LibPack64" Name="TKernel.dll"   />
-				<File Id="LibPack65" Name="TKFillet.dll"   />
-				<File Id="LibPack66" Name="TKG2d.dll"   />
-				<File Id="LibPack67" Name="TKG3d.dll"   />
-				<File Id="LibPack68" Name="TKGeomAlgo.dll"   />
-				<File Id="LibPack69" Name="TKGeomBase.dll"   />
-				<File Id="LibPack70" Name="TKHLR.dll"   />
-				<File Id="LibPack71" Name="TKIGES.dll"   />
-				<File Id="LibPack72" Name="TKMath.dll"   />
-				<File Id="LibPack73" Name="TKMesh.dll"   />
-				<File Id="LibPack74" Name="TKMeshVS.dll"   />
-				<File Id="LibPack75" Name="TKOffset.dll"   />
-				<File Id="LibPack76" Name="TKPrim.dll"   />
-				<File Id="LibPack77" Name="TKService.dll"   />
-				<File Id="LibPack78" Name="TKShHealing.dll"   />
-				<File Id="LibPack79" Name="TKSTEP209.dll"   />
-				<File Id="LibPack80" Name="TKSTEP.dll"   />
-				<File Id="LibPack81" Name="TKSTEPAttr.dll"   />
-				<File Id="LibPack82" Name="TKSTEPBase.dll"   />
-				<File Id="LibPack83" Name="TKSTL.dll"   />
-				<File Id="LibPack84" Name="TKTopAlgo.dll"   />
-				<File Id="LibPack85" Name="TKXSBase.dll"   />
-				<?if $(var.ProcessorArchitecture)=x64 ?>
-				<File Id="LibPack86" Name="xerces-c_3_1.dll"   />
-				<?else ?>
-				<File Id="LibPack86" Name="xerces-c_2_8.dll"   />
-				<?endif ?>
-				<File Id="LibPack87" Name="zlib1.dll"   />
-				<File Id="LibPack88" Name="TKAdvTools.dll"   />
-				<File Id="LibPack89" Name="TKV2d.dll"   />
-				<File Id="LibPack90" Name="TKV3d.dll"   />
-				<File Id="LibPack91" Name="Driver.dll"   />
-				<File Id="LibPack92" Name="DriverDAT.dll"   />
-				<File Id="LibPack93" Name="DriverSTL.dll"   />
-				<File Id="LibPack94" Name="DriverUNV.dll"   />
-				<File Id="LibPack95" Name="MEFISTO2.dll"   />
-				<File Id="LibPack96" Name="MEFISTO2F.dll"   />
-				<File Id="LibPack97" Name="SMDS.dll"   />
-				<File Id="LibPack98" Name="SMESH.dll"   />
-				<File Id="LibPack99" Name="SMESHDS.dll"   />
-				<File Id="LibPack100" Name="StdMeshers.dll"   />
-				<File Id="LibPack101" Name="TKCAF.dll"   />
-				<File Id="LibPack102" Name="TKCDF.dll"   />
-				<File Id="LibPack103" Name="TKLCAF.dll"   />
-				<File Id="LibPack104" Name="TKXCAF.dll"   />
-				<File Id="LibPack105" Name="TKXDEIGES.dll"   />
-				<File Id="LibPack106" Name="TKXDESTEP.dll"   />
-				<File Id="LibPack107" Name="TKFeat.dll"   />
-            </Component>
-			<Directory Id="ImageFormDir" Name="imageformats" FileSource="../../bin/imageformats" >
-				<Component Id="ImageForm"  Guid="2139da00-a109-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="ImageForm1" Name="qgif4.dll"   />
-					<File Id="ImageForm2" Name="qjpeg4.dll"   />
-					<File Id="ImageForm3" Name="qmng4.dll"   />
-					<File Id="ImageForm4" Name="qsvg4.dll"   />
-					<File Id="ImageForm5" Name="qtiff4.dll"   />
-				</Component>			
-			</Directory>
-			<Directory Id="accessibleDir" Name="accessible" FileSource="../../bin/accessible" >
-				<Component Id="accessible"  Guid="f5800b90-a109-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="accessible1" Name="qtaccessiblecompatwidgets4.dll"   />
-					<File Id="accessible2" Name="qtaccessiblewidgets4.dll"   />
-				</Component>			
-			</Directory>
-			<Directory Id="codecsDir" Name="codecs" FileSource="../../bin/codecs" >
-				<Component Id="codecs"  Guid="641d0030-a10a-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="codecs1" Name="qcncodecs4.dll"   />
-					<File Id="codecs2" Name="qjpcodecs4.dll"   />
-					<File Id="codecs3" Name="qkrcodecs4.dll"   />
-					<File Id="codecs4" Name="qtwcodecs4.dll"   />
-				</Component>			
-			</Directory>
-			<Directory Id="iconenginesDir" Name="iconengines" FileSource="../../bin/iconengines" >
-				<Component Id="iconengines"  Guid="c65a8970-a10a-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="iconengines1" Name="qsvgicon4.dll"   />
-				</Component>			
-			</Directory>
-			<Directory Id="sqldriversDir" Name="sqldrivers" FileSource="../../bin/sqldrivers" >
-				<Component Id="sqldrivers"  Guid="16bcd850-a10b-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="sqldrivers1" Name="qsqlite4.dll"   />
-				</Component>			
-			</Directory>
-			<Directory Id="PivyDir" Name="pivy" FileSource="../../bin/pivy" >
-				<Component Id="PivyTop"  Guid="b18123c0-3fb0-4cc0-85e8-f71038172b34" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="Pivy1" Name="__init__.py"   />
-					<File Id="Pivy2" Name="_coin.pyd"   />
-					<File Id="Pivy3" Name="coin.py"   />
-					<File Id="Pivy4" Name="sogui.py"   />
-				</Component>
-				<Directory Id="PivyGuiDir" Name="gui" FileSource="../../bin/pivy/gui" >
-					<Component Id="PivyGui"  Guid="9829370b-fad4-4606-9802-6ff90ad8474e" Win64='$(var.Win_64)' KeyPath="yes">
-						<File Id="Pivy5" Name="__init__.py"   />
-						<File Id="Pivy6" Name="_soqt.pyd"   />
-						<File Id="Pivy7" Name="soqt.py"   />
-					</Component>
-				</Directory>
-			</Directory>
-			<Directory Id="PyQtDir" Name="PyQt4" FileSource="../../bin/PyQt4" >
-				<Component Id="PyQtTop"  Guid="17b2fc4c-61e2-447e-95af-5b65cad125aa" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="PyQt1" Name="__init__.py"   />
-					<File Id="PyQt4" Name="pyqtconfig.py"   />
-					<File Id="PyQt6" Name="Qt.pyd"   />
-					<File Id="PyQt7" Name="QtAssistant.pyd"   />
-					<File Id="PyQt8" Name="QtCore.pyd"   />
-					<File Id="PyQt9" Name="QtDesigner.pyd"   />
-					<File Id="PyQt10" Name="QtGui.pyd"   />
-					<File Id="PyQt11" Name="QtNetwork.pyd"   />
-					<File Id="PyQt12" Name="QtOpenGL.pyd"   />
-					<File Id="PyQt13" Name="QtScript.pyd"   />
-					<File Id="PyQt14" Name="QtSql.pyd"   />
-					<File Id="PyQt15" Name="QtSvg.pyd"   />
-					<File Id="PyQt16" Name="QtTest.pyd"   />
-					<File Id="PyQt17" Name="QtXml.pyd"   />
-					<File Id="PyQt18" Name="QtHelp.pyd"   />
-					<File Id="PyQt19" Name="QtScriptTools.pyd"   />
-					<File Id="PyQt21" Name="QtWebKit.pyd"   />
-					<File Id="PyQt22" Name="QtXmlPatterns.pyd"   />
-				</Component>
-				<Directory Id="PyQtUicDir" Name="uic" FileSource="../../bin/PyQt4/uic" >
-					<Component Id="PyQtUic"  Guid="c81a900c-8292-4631-9b52-25ac825b99c8" Win64='$(var.Win_64)' KeyPath="yes">
-						<File Id="PyQt_18" Name="__init__.py"   />
-						<File Id="PyQt_19" Name="exceptions.py"   />
-						<File Id="PyQt_20" Name="objcreator.py"   />
-						<File Id="PyQt_21" Name="properties.py"   />
-						<File Id="PyQt_22" Name="pyuic.py"   />
-						<File Id="PyQt_23" Name="uiparser.py"   />
-					</Component>
-					<Directory Id="PyQtCompilerDir" Name="Compiler" FileSource="../../bin/PyQt4/uic/Compiler" >
-						<Component Id="PyQtCompiler"  Guid="f20f3c7f-5550-48e4-b769-5d6658a1fb4e" Win64='$(var.Win_64)' KeyPath="yes">
-							<File Id="PyQt24" Name="__init__.py"   />
-							<File Id="PyQt25" Name="compiler.py"   />
-							<File Id="PyQt26" Name="indenter.py"   />
-							<File Id="PyQt27" Name="qobjectcreator.py"   />
-							<File Id="PyQt28" Name="qtproxies.py"   />
-						</Component>											
-					</Directory>
-					<Directory Id="PyQtLoaderDir" Name="Loader" FileSource="../../bin/PyQt4/uic/Loader" >
-						<Component Id="PyQtLoader"  Guid="3f0dfb67-fd56-4928-83f4-148a7f4bf115" Win64='$(var.Win_64)' KeyPath="yes">
-							<File Id="PyQt29" Name="__init__.py"   />
-							<File Id="PyQt30" Name="loader.py"   />
-							<File Id="PyQt31" Name="qobjectcreator.py"   />
-						</Component>											
-					</Directory>
-					<Directory Id="PyQtWidgetPluginsDir" Name="widget-plugins" FileSource="../../bin/PyQt4/uic/widget-plugins" >
-						<Component Id="PyQtWidgetPlugins"  Guid="6f4ee199-1574-4989-86c9-2f05036a3a44" Win64='$(var.Win_64)' KeyPath="yes">
-							<File Id="PyQt32" Name="qaxcontainer.py"   />
-							<File Id="PyQt33" Name="qscintilla.py"   />
-							<File Id="PyQt34" Name="qtwebkit.py"   />
-						</Component>											
-					</Directory>
-				</Directory>
-				<!--
-				<Directory Id="PyQtQwt5Dir" Name="Qwt5" FileSource="../../bin/PyQt4/Qwt5" >
-					<Component Id="PyQtQwt5"  Guid="40fefaa5-e488-429f-a360-170aef59814c" Win64='$(var.Win_64)' KeyPath="yes">
-						<File Id="PyQt35" Name="__init__.py"   />
-						<File Id="PyQt36" Name="anynumpy.py"   />
-						<File Id="PyQt37" Name="Qwt.pyd"   />
-					</Component>
-				</Directory>
-				-->
-			</Directory>
-		</DirectoryRef>
-	</Fragment>
-</Wix>
\ No newline at end of file
diff --git a/src/WindowsInstaller/LibPackDll.wxi b/src/WindowsInstaller/LibPackDll.wxi
deleted file mode 100644
index f35d72c0de..0000000000
--- a/src/WindowsInstaller/LibPackDll.wxi
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <File Id="DLL1"  Name="boost_date_time-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL2"  Name="boost_filesystem-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL3"  Name="boost_iostreams-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL4"  Name="boost_program_options-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL5"  Name="boost_regex-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL6"  Name="boost_serialization-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL7"  Name="boost_signals-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL8"  Name="boost_thread-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL9"  Name="boost_wserialization-vc90-mt-1_39_1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL13"  Name="coin3.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL26"  Name="python26.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL27"  Name="python26.zip" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL28"  Name="_socket.pyd" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL29"  Name="pyexpat.pyd" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL30"  Name="select.pyd" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL31"  Name="sip.pyd" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL32"  Name="unicodedata.pyd" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL40"  Name="soqt1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL41"  Name="QtCore4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL42"  Name="QtDesigner4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL43"  Name="QtDesignerComponents4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL44"  Name="QtGui4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL45"  Name="QtNetwork4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL46"  Name="QtOpenGL4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL47"  Name="QtSql4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL48"  Name="QtSvg4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL49"  Name="QtTest4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL50"  Name="QtXml4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL51"  Name="QtWebKit4.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL61"  Name="TKBO.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL62"  Name="TKBool.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL63"  Name="TKBRep.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL64"  Name="TKernel.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL65"  Name="TKFillet.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL66"  Name="TKG2d.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL67"  Name="TKG3d.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL68"  Name="TKGeomAlgo.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL69"  Name="TKGeomBase.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL70"  Name="TKHLR.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL71"  Name="TKIGES.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL72"  Name="TKMath.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL73"  Name="TKMesh.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL74"  Name="TKMeshVS.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL75"  Name="TKOffset.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL76"  Name="TKPrim.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL77"  Name="TKService.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL78"  Name="TKShHealing.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL79"  Name="TKSTEP209.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL80"  Name="TKSTEP.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL81"  Name="TKSTEPAttr.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL82"  Name="TKSTEPBase.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL83"  Name="TKSTL.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL84"  Name="TKTopAlgo.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL85"  Name="TKXSBase.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL86"  Name="Wm3Foundation80.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL87"  Name="xerces-c_2_8.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL88"  Name="zlib1.dll" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <File Id="DLL90"  Name="wget.exe" Source="$(env.FREECADLIB)\bin\" DiskId="1" />
-    <!--<File Id='DLL91'    Name='ERR91' LongName='_sre.pyd' src='$(env.FREECADLIB)\bin\' DiskId='1' /> -->
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModArch.wxi b/src/WindowsInstaller/ModArch.wxi
deleted file mode 100644
index 5930742135..0000000000
--- a/src/WindowsInstaller/ModArch.wxi
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2009                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2009                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModArch" Name="Arch" FileSource="../../Mod/Arch">
-        <Component Id="CompModArch" Guid="ab68f438-aed3-4327-8806-d53bf0a43853" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="ArchInitPy" Name="Init.py" DiskId="1" />
-            <File Id="ArchInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="ArchPy" Name="Arch.py" DiskId="1" />
-            <File Id="ArchRcPy" Name="Arch_rc.py" DiskId="1" />
-            <File Id="ArchBuildingPy" Name="ArchBuilding.py" DiskId="1" />
-            <File Id="ArchCommandsPy" Name="ArchCommands.py" DiskId="1" />
-            <File Id="ArchComponentPy" Name="ArchComponent.py" DiskId="1" />
-            <File Id="ArchIfcReaderPy" Name="ifcReader.py" DiskId="1" />
-            <File Id="importDAEPy" Name="importDAE.py" DiskId="1" />
-            <File Id="importIFCPy" Name="importIFC.py" DiskId="1" />
-            <File Id="importOBJPy" Name="importOBJ.py" DiskId="1" />
-            <File Id="ArchSitePy" Name="ArchSite.py" DiskId="1" />
-            <File Id="ArchStructurePy" Name="ArchStructure.py" DiskId="1" />
-            <File Id="ArchWallPy" Name="ArchWall.py" DiskId="1" />
-            <File Id="ArchFloorPy" Name="ArchFloor.py" DiskId="1" />
-            <File Id="ArchSectionPlanePy" Name="ArchSectionPlane.py" DiskId="1" />
-            <File Id="ArchWindowPy" Name="ArchWindow.py" DiskId="1" />
-            <File Id="ArchAxisPy" Name="ArchAxis.py" DiskId="1" />
-            <File Id="ArchVRMPy" Name="ArchVRM.py" DiskId="1" />
-            <File Id="ArchRoofPy" Name="ArchRoof.py" DiskId="1" />
-            <File Id="importWebGLPy" Name="importWebGL.py" DiskId="1" />
-            <File Id="ArchSpacePy" Name="ArchSpace.py" DiskId="1" />
-            <File Id="TestArchPy" Name="TestArch.py" DiskId="1" />
-            <File Id="ArchStairsPy" Name="ArchStairs.py" DiskId="1" />
-            <File Id="ArchRebarPy" Name="ArchRebar.py" DiskId="1" />
-            <File Id="ArchIfcWriterPy" Name="ifcWriter.py" DiskId="1" />
-            <File Id="ArchRebarPy" Name="ArchFrame.py" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
diff --git a/src/WindowsInstaller/ModCam.wxi b/src/WindowsInstaller/ModCam.wxi
deleted file mode 100644
index 9e7e0111a0..0000000000
--- a/src/WindowsInstaller/ModCam.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2008                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModCam" Name="Cam" FileSource="../../Mod/Cam">
-        <Component Id="CompModCam" Guid="1e198527-7b8c-4113-abd4-a116c8f8c849" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="CamInitPy" Name="Init.py" DiskId="1" />
-            <File Id="CamInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Campyd" Name="Cam.pyd" DiskId="1" />
-            <File Id="CamGuipyd" Name="CamGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModComplete.wxi b/src/WindowsInstaller/ModComplete.wxi
deleted file mode 100644
index 616be9f154..0000000000
--- a/src/WindowsInstaller/ModComplete.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2008                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModComplete" Name="Complete" FileSource="../../Mod/Complete">
-        <Component Id="CompModComplete" Guid="4f306f50-94a2-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="CompleteInitPy" Name="Init.py" DiskId="1" />
-            <File Id="CompleteInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Completepyd" Name="Complete.pyd" DiskId="1" />
-            <File Id="CompleteGuipyd" Name="CompleteGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModDraft.wxi b/src/WindowsInstaller/ModDraft.wxi
deleted file mode 100644
index a80dd345ef..0000000000
--- a/src/WindowsInstaller/ModDraft.wxi
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2009                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2009                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModDraft" Name="Draft" FileSource="../../Mod/Draft">
-        <Component Id="CompModDraft" Guid="a5baca60-076f-11de-8c30-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="DraftInitPy" Name="Init.py" DiskId="1" />
-            <File Id="DraftInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="DraftPy" Name="Draft.py" DiskId="1" />
-            <File Id="DraftToolsPy" Name="DraftTools.py" DiskId="1" />
-            <File Id="DraftGuiPy" Name="DraftGui.py" DiskId="1" />
-            <File Id="DraftSnapPy" Name="DraftSnap.py" DiskId="1" />
-            <File Id="DraftTrackersPy" Name="DraftTrackers.py" DiskId="1" />
-            <File Id="importDXFPy" Name="importDXF.py" DiskId="1" />
-            <File Id="importOCAPy" Name="importOCA.py" DiskId="1" />
-            <File Id="importSVGPy" Name="importSVG.py" DiskId="1" />
-            <File Id="importAirfoilDATPy" Name="importAirfoilDAT.py" DiskId="1" />
-            <File Id="WorkingPlanePy" Name="WorkingPlane.py" DiskId="1" />
-            <File Id="macrosPy" Name="macros.py" DiskId="1" />
-            <File Id="DraftRcPy" Name="Draft_rc.py" DiskId="1" />
-            <File Id="DraftVecUtilsPy" Name="DraftVecUtils.py" DiskId="1" />
-            <File Id="DraftGeomUtilsPy" Name="DraftGeomUtils.py" DiskId="1" />
-            <File Id="importDWGPy" Name="importDWG.py" DiskId="1" />
-            <File Id="TestDraftPy" Name="TestDraft.py" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
diff --git a/src/WindowsInstaller/ModDrawing.wxi b/src/WindowsInstaller/ModDrawing.wxi
deleted file mode 100644
index 7060491bba..0000000000
--- a/src/WindowsInstaller/ModDrawing.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2008                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2008                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModDrawing" Name="Drawing" FileSource="../../Mod/Drawing">
-        <Component Id="CompModDrawing" Guid="9cde5801-febf-4b05-8c72-97378dfb81a5" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="DrawingInitPy" Name="Init.py" DiskId="1" />
-            <File Id="DrawingInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="DrawingApp" Name="Drawing.pyd" DiskId="1" />
-            <File Id="DrawingGui" Name="DrawingGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModFem.wxi b/src/WindowsInstaller/ModFem.wxi
deleted file mode 100644
index 8cd54486fb..0000000000
--- a/src/WindowsInstaller/ModFem.wxi
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2010                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2010                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModFem" Name="Fem" FileSource="../../Mod/Fem">
-        <Component Id="CompModFem" Guid="8fbeba84-4456-4476-a663-99db2ab0505a" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="FemInitPy" Name="Init.py" DiskId="1" />
-            <File Id="FemInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Fempyd" Name="Fem.pyd" DiskId="1" />
-            <File Id="FemGuipyd" Name="FemGui.pyd" DiskId="1" />
-            <File Id="TetGen" Name="convert2TetGen.py" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModImage.wxi b/src/WindowsInstaller/ModImage.wxi
deleted file mode 100644
index 7e4dabd0d8..0000000000
--- a/src/WindowsInstaller/ModImage.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModImage" Name="Image" FileSource="../../Mod/Image">
-        <Component Id="CompModImage" Guid="23FF207E-6D03-4273-8475-D0F675A3319C" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="ImageInitPy" Name="Init.py" DiskId="1" />
-            <File Id="ImageInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Imagepyd" Name="Image.pyd" DiskId="1" />
-            <File Id="ImageGuipyd" Name="ImageGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModImport.wxi b/src/WindowsInstaller/ModImport.wxi
deleted file mode 100644
index 3801da17fa..0000000000
--- a/src/WindowsInstaller/ModImport.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModImport" Name="Import" FileSource="../../Mod/Import">
-        <Component Id="CompModImport" Guid="3E770866-6931-4e27-8F47-06C28893D762" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="ImportInitPy" Name="Init.py" DiskId="1" />
-            <File Id="ImportInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Importpyd" Name="Import.pyd" DiskId="1" />
-            <File Id="ImportGuipyd" Name="ImportGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModInspection.wxi b/src/WindowsInstaller/ModInspection.wxi
deleted file mode 100644
index 085b3e65ad..0000000000
--- a/src/WindowsInstaller/ModInspection.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModInspection" Name="Inspection" FileSource="../../Mod/Inspection">
-        <Component Id="CompModInspection" Guid="735BA09F-6E37-47a5-87BD-A7F9762FB3CC" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="InspectionInitPy" Name="Init.py" DiskId="1" />
-            <File Id="InspectionInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Inspectionpyd" Name="Inspection.pyd" DiskId="1" />
-            <File Id="InspectionGuipyd" Name="InspectionGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModMesh.wxi b/src/WindowsInstaller/ModMesh.wxi
deleted file mode 100644
index 5fb14028cf..0000000000
--- a/src/WindowsInstaller/ModMesh.wxi
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModMesh" Name="Mesh" FileSource="../../Mod/Mesh">
-        <Component Id="CompModMesh" Guid="209D916B-10C6-445d-8973-F276E28E2A72" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="MeshInitPy" Name="Init.py" DiskId="1" />
-            <File Id="MeshInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Meshpyd" Name="Mesh.pyd" DiskId="1" />
-            <File Id="MeshGuipyd" Name="MeshGui.pyd" DiskId="1" />
-            <File Id="BuildRegpy" Name="BuildRegularGeoms.py" DiskId="1" />
-            <File Id="MeshTest" Name="MeshTestsApp.py" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModMeshPart.wxi b/src/WindowsInstaller/ModMeshPart.wxi
deleted file mode 100644
index fb19c39061..0000000000
--- a/src/WindowsInstaller/ModMeshPart.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModMeshPart" Name="MeshPart" FileSource="../../Mod/MeshPart">
-        <Component Id="CompModMeshPart" Guid="6c6fbdc0-94a5-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="MeshPartInitPy" Name="Init.py" DiskId="1" />
-            <File Id="MeshPartInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="MeshPartpyd" Name="MeshPart.pyd" DiskId="1" />
-            <File Id="MeshPartGuipyd" Name="MeshPartGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModOpenSCAD.wxi b/src/WindowsInstaller/ModOpenSCAD.wxi
deleted file mode 100644
index def24ebbed..0000000000
--- a/src/WindowsInstaller/ModOpenSCAD.wxi
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2012                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2012                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModOpenSCAD" Name="OpenSCAD" FileSource="../../Mod/OpenSCAD">
-        <Component Id="CompModOpenSCAD" Guid="54fb73e3-7c3a-4a43-b376-008dfae6d103" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="OpenSCADInitPy" Name="Init.py" DiskId="1" />
-            <File Id="OpenSCADInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="colorcodeshapesPy" Name="colorcodeshapes.py" DiskId="1" />
-            <File Id="expandplacementspy" Name="expandplacements.py" DiskId="1" />
-            <File Id="exportCSGpy" Name="exportCSG.py" DiskId="1" />
-            <File Id="importCSGpy" Name="importCSG.py" DiskId="1" />
-            <File Id="OpenSCAD_rcpy" Name="OpenSCAD_rc.py" DiskId="1" />
-            <File Id="OpenSCAD2Dgeompy" Name="OpenSCAD2Dgeom.py" DiskId="1" />
-            <File Id="OpenSCADCommandspy" Name="OpenSCADCommands.py" DiskId="1" />
-            <File Id="OpenSCADFeaturespy" Name="OpenSCADFeatures.py" DiskId="1" />
-            <File Id="OpenSCADUtilspy" Name="OpenSCADUtils.py" DiskId="1" />
-            <File Id="replaceobjpy" Name="replaceobj.py" DiskId="1" />
-            <File Id="tokrulespy" Name="tokrules.py" DiskId="1" />
-        </Component>
-		<Directory Id="ModOpenSCADPly" Name="ply" FileSource="../../Mod/OpenSCAD/ply">
-	        <Component Id="CompModOpenSCADPly" Guid="870b896b-30f8-4d3b-b923-36536c0c2859" Win64='$(var.Win_64)' KeyPath="yes">
-	            <File Id="OpenSCADLibInitPy" Name="__init__.py" DiskId="1" />
-	            <File Id="OpenSCADLibREADME" Name="README" DiskId="1" />
-	            <File Id="OpenSCADLibyaccpy" Name="yacc.py" DiskId="1" />
-	            <File Id="OpenSCADLiblexpy" Name="lex.py" DiskId="1" />
-	        </Component>
-		</Directory>
-    </Directory>
-</Include>
diff --git a/src/WindowsInstaller/ModPart.wxi b/src/WindowsInstaller/ModPart.wxi
deleted file mode 100644
index eb5803e12b..0000000000
--- a/src/WindowsInstaller/ModPart.wxi
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModPart" Name="Part" FileSource="../../Mod/Part">
-        <Component Id="CompModPart" Guid="C2B9C611-A685-4777-8BF5-C03C9B25F1FD" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="PartInitPy" Name="Init.py" DiskId="1" />
-            <File Id="PartInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Partpyd" Name="Part.pyd" DiskId="1" />
-            <File Id="PartGuipyd" Name="PartGui.pyd" DiskId="1" />
-            <File Id="TestPartAppPy" Name="TestPartApp.py" DiskId="1" />
-            <File Id="TestPartGuiPy" Name="TestPartGui.py" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModPartDesign.wxi b/src/WindowsInstaller/ModPartDesign.wxi
deleted file mode 100644
index 03e1905f19..0000000000
--- a/src/WindowsInstaller/ModPartDesign.wxi
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModPartDesign" Name="PartDesign" FileSource="../../Mod/PartDesign">
-        <Component Id="CompModPartDesign" Guid="62d8c130-94a5-11dd-ad8b-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="PartDesignInitPy" Name="Init.py" DiskId="1" />
-            <File Id="PartDesignInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="PartDesignpyd" Name="PartDesign.pyd" DiskId="1" />
-            <File Id="PartDesignGuipyd" Name="PartDesignGui.pyd" DiskId="1" />
-            <File Id="TestPartDesignAppPy" Name="TestPartDesignApp.py" DiskId="1" />
-            <File Id="TestPartDesignGuiPy" Name="TestPartDesignGui.py" DiskId="1" />
-            <File Id="PartDesign__init__py" Name="__init__.py"  />
-        </Component>
-        <Directory Id="ModPartDesignScripts" Name="Scripts" FileSource="../../Mod/PartDesign/Scripts">
-          <Component Id="CompModPartDesignScripts" Guid="1aeda5e4-a7f9-48b3-9952-838c796f7880" Win64='$(var.Win_64)' KeyPath="yes">
-              <File Id="PartDesignScripts__init__py" Name="__init__.py"  />
-              <File Id="DistanceBoltpy" Name="DistanceBolt.py"  />
-              <File Id="Gearpy" Name="Gear.py"  />
-              <File Id="RadialCopypy" Name="RadialCopy.py"  />
-              <File Id="Parallelepipedpy" Name="Parallelepiped.py"  />
-          </Component>
-        </Directory>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModPlot.wxi b/src/WindowsInstaller/ModPlot.wxi
deleted file mode 100644
index f536a491dc..0000000000
--- a/src/WindowsInstaller/ModPlot.wxi
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Jose Luis Cercos Pita (jlcercos@gmail.com) 2012                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Jose Luis Cercos Pita 2012
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModPlot" Name="Plot" FileSource="../../Mod/Plot">
-        <Component Id="CompModPlot" Guid="672b5f07-5779-47a0-a1fc-6be045329d75" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="PlotGuiPy" Name="PlotGui.py" DiskId="1" />
-            <File Id="PlotInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="PlotInstance" Name="Plot.py" DiskId="1" />
-            <File Id="PlotResources" Name="Plot_rc.py" DiskId="1" />
-        </Component>
-		<Directory Id="ModplotAxes" Name="plotAxes" FileSource="../../Mod/Plot/plotAxes" >
-			<Component Id="CompModplotAxes"  Guid="0dfd62d2-196b-45e8-ba6d-a51267233890" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="plotAxes01" Name="__init__.py"   />
-				<File Id="plotAxes02" Name="TaskPanel.py"   />
-				<File Id="plotAxes03" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModplotLabels" Name="plotLabels" FileSource="../../Mod/Plot/plotLabels" >
-			<Component Id="CompModplotLabels"  Guid="5741d177-c82c-4489-a344-775c0fa82a05" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="plotLabels01" Name="__init__.py"   />
-				<File Id="plotLabels02" Name="TaskPanel.py"   />
-				<File Id="plotLabels03" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModplotPositions" Name="plotPositions" FileSource="../../Mod/Plot/plotPositions" >
-			<Component Id="CompModplotPositions"  Guid="d6fd8e93-e4df-4e78-8ac6-9f74eccbb64c" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="plotPositions01" Name="__init__.py"   />
-				<File Id="plotPositions02" Name="TaskPanel.py"   />
-				<File Id="plotPositions03" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModplotSave" Name="plotSave" FileSource="../../Mod/Plot/plotSave" >
-			<Component Id="CompModplotSave"  Guid="0d9896e0-f992-41e9-a52c-ea24fcb786d4" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="plotSave01" Name="__init__.py"   />
-				<File Id="plotSave02" Name="TaskPanel.py"   />
-				<File Id="plotSave03" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModplotSeries" Name="plotSeries" FileSource="../../Mod/Plot/plotSeries" >
-			<Component Id="CompModplotSeries"  Guid="4adb6faf-867a-4c23-b8de-34f9149b8805" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="plotSeries01" Name="__init__.py"   />
-				<File Id="plotSeries02" Name="TaskPanel.py"   />
-				<File Id="plotSeries03" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModplotUtils" Name="plotUtils" FileSource="../../Mod/Plot/plotUtils" >
-			<Component Id="CompModplotUtils"  Guid="861945d1-6105-4063-8cbb-93235876e15b" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="plotUtils01" Name="__init__.py"   />
-				<File Id="plotUtils02" Name="Paths.py"   />
-			</Component>
-		</Directory>
-	</Directory>
-</Include>
diff --git a/src/WindowsInstaller/ModPoints.wxi b/src/WindowsInstaller/ModPoints.wxi
deleted file mode 100644
index 6fc6f963fd..0000000000
--- a/src/WindowsInstaller/ModPoints.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModPoints" Name="Points" FileSource="../../Mod/Points">
-        <Component Id="CompModPoints" Guid="F14D207D-B088-41e6-A758-A44DDDDD56F8" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="PointsInitPy" Name="Init.py" DiskId="1" />
-            <File Id="PointsInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Pointspyd" Name="Points.pyd" DiskId="1" />
-            <File Id="PointsGuipyd" ShortName="PoinGui.pyd" Name="PointsGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModRaytracing.wxi b/src/WindowsInstaller/ModRaytracing.wxi
deleted file mode 100644
index 69c4fe232d..0000000000
--- a/src/WindowsInstaller/ModRaytracing.wxi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModRaytracing" ShortName="Raytr" Name="Raytracing" FileSource="../../Mod/Raytracing">
-        <Component Id="CompModRaytracing" Guid="80A38BA9-B6BF-4909-94F8-221782DB7B4D" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="RaytracingInitPy" Name="Init.py" DiskId="1" />
-            <File Id="RaytracingInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Raytracingpyd" ShortName="Raytra.pyd" Name="Raytracing.pyd" DiskId="1" />
-            <File Id="RaytracingGuipyd" ShortName="RaytraG.pyd" Name="RaytracingGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModRobot.wxi b/src/WindowsInstaller/ModRobot.wxi
deleted file mode 100644
index 932f8a8d93..0000000000
--- a/src/WindowsInstaller/ModRobot.wxi
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2009                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2008                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModRobot" Name="Robot" FileSource="../../Mod/Robot">
-        <Component Id="CompModRobot" Guid="5375c2e0-de75-11de-8a39-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="RobotInitPy" Name="Init.py" DiskId="1" />
-            <File Id="RobotInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="MovieToolPy" Name="MovieTool.py" DiskId="1" />
-            <File Id="KukaExporterPy" Name="KukaExporter.py" DiskId="1" />
-            <File Id="RobotExamplePy" Name="RobotExample.py" DiskId="1" />
-            <File Id="Robotpyd" Name="Robot.pyd" DiskId="1" />
-            <File Id="RobotGuipyd" Name="RobotGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModShip.wxi b/src/WindowsInstaller/ModShip.wxi
deleted file mode 100644
index 6c863a5767..0000000000
--- a/src/WindowsInstaller/ModShip.wxi
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Jose Luis Cercos Pita (jlcercos@gmail.com) 2012                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Jose Luis Cercos Pita 2012
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModShip" Name="Ship" FileSource="../../Mod/Ship">
-        <Component Id="CompModShip" Guid="4ddaaa92-1ccc-4462-ab58-606082aa277e" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="ShipInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="ShipInstance" Name="Instance.py" DiskId="1" />
-            <File Id="ShipConsoleInterface" Name="Ship.py" DiskId="1" />
-            <File Id="ShipGuiPy" Name="ShipGui.py" DiskId="1" />
-            <File Id="ShipResources" Name="Ship_rc.py" DiskId="1" />
-            <File Id="ShipTankInstance" Name="TankInstance.py" DiskId="1" />
-            <File Id="ShipWeightInstance" Name="WeightInstance.py" DiskId="1" />
-        </Component>
-		<Directory Id="ModShipResources" Name="resources" FileSource="../../Mod/Ship/resources" >
-			<Directory Id="ModShipExamples" Name="examples" FileSource="../../Mod/Ship/resources/examples" >
-				<Component Id="CompModShipExamples"  Guid="b5f1ae58-728b-4c0a-9b09-263cd63cdfd1" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="ShipExampleS60" Name="s60.fcstd"   />
-					<File Id="ShipExampleS60Katamaran" Name="s60_katamaran.fcstd"   />
-					<File Id="ShipExampleWigley" Name="wigley.fcstd"   />
-					<File Id="ShipExampleWigleyKatamaran" Name="wigley_katamaran.fcstd"   />
-				</Component>
-			</Directory>
-		</Directory>
-		<Directory Id="ModshipAreasCurve" Name="shipAreasCurve" FileSource="../../Mod/Ship/shipAreasCurve" >
-			<Component Id="CompModshipAreasCurve"  Guid="49b32e4c-d861-4968-9c5c-8191ce6fa6c4" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipAreasCurve01" Name="__init__.py"   />
-				<File Id="shipAreasCurve02" Name="PlotAux.py"   />
-				<File Id="shipAreasCurve03" Name="Preview.py"   />
-				<File Id="shipAreasCurve04" Name="TaskPanel.py"   />
-				<File Id="shipAreasCurve05" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipCapacityCurve" Name="shipCapacityCurve" FileSource="../../Mod/Ship/shipCapacityCurve" >
-			<Component Id="CompModshipCapacityCurve"  Guid="1714cf1c-728a-4989-8ea0-622043f6c9b3" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipCapacityCurve01" Name="__init__.py"   />
-				<File Id="shipCapacityCurve02" Name="PlotAux.py"   />
-				<File Id="shipCapacityCurve03" Name="TaskPanel.py"   />
-				<File Id="shipCapacityCurve04" Name="TaskPanel.ui"   />
-				<File Id="shipCapacityCurve05" Name="Tools.py"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipCreateLoadCondition" Name="shipCreateLoadCondition" FileSource="../../Mod/Ship/shipCreateLoadCondition" >
-			<Component Id="CompModshipCreateLoadCondition"  Guid="821f7073-b0aa-47c5-ada4-7e4c045c06e6" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipCreateLoadCondition01" Name="__init__.py"   />
-				<File Id="shipCreateLoadCondition02" Name="Tools.py"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipCreateShip" Name="shipCreateShip" FileSource="../../Mod/Ship/shipCreateShip" >
-			<Component Id="CompModshipCreateShip"  Guid="7492bfb5-96d8-4555-8cc0-682c79a779ac" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipCreateShip01" Name="__init__.py"   />
-				<File Id="shipCreateShip02" Name="Preview.py"   />
-				<File Id="shipCreateShip03" Name="TaskPanel.py"   />
-				<File Id="shipCreateShip04" Name="TaskPanel.ui"   />
-				<File Id="shipCreateShip05" Name="Tools.py"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipCreateTank" Name="shipCreateTank" FileSource="../../Mod/Ship/shipCreateTank" >
-			<Component Id="CompModshipCreateTank"  Guid="eed2147f-2a45-4c12-aac6-bffae3ac1253" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipCreateTank01" Name="__init__.py"   />
-				<File Id="shipCreateTank02" Name="TaskPanel.py"   />
-				<File Id="shipCreateTank03" Name="TaskPanel.ui"   />
-				<File Id="shipCreateTank04" Name="Tools.py"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipCreateWeight" Name="shipCreateWeight" FileSource="../../Mod/Ship/shipCreateWeight" >
-			<Component Id="CompModshipCreateWeight"  Guid="05b5db99-5bcc-421a-83e5-2279cb4f9ab0" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipCreateWeight01" Name="__init__.py"   />
-				<File Id="shipCreateWeight02" Name="TaskPanel.py"   />
-				<File Id="shipCreateWeight03" Name="TaskPanel.ui"   />
-				<File Id="shipCreateWeight04" Name="Tools.py"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipGZ" Name="shipGZ" FileSource="../../Mod/Ship/shipGZ" >
-			<Component Id="CompModshipGZ"  Guid="62099cb8-1ba3-45df-b012-42f6bb80fb1b" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipGZ01" Name="__init__.py"   />
-				<File Id="shipGZ02" Name="PlotAux.py"   />
-				<File Id="shipGZ03" Name="TaskPanel.py"   />
-				<File Id="shipGZ04" Name="TaskPanel.ui"   />
-				<File Id="shipGZ05" Name="Tools.py"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipHydrostatics" Name="shipHydrostatics" FileSource="../../Mod/Ship/shipHydrostatics" >
-			<Component Id="CompModshipHydrostatics"  Guid="c76a6ae1-8533-4382-950b-bde2733603a8" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipHydrostatics01" Name="__init__.py"   />
-				<File Id="shipHydrostatics02" Name="PlotAux.py"   />
-				<File Id="shipHydrostatics03" Name="TaskPanel.py"   />
-				<File Id="shipHydrostatics04" Name="TaskPanel.ui"   />
-				<File Id="shipHydrostatics05" Name="Tools.py"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipLoadExample" Name="shipLoadExample" FileSource="../../Mod/Ship/shipLoadExample" >
-			<Component Id="CompModshipLoadExample"  Guid="3c66c63a-7967-4fe7-8138-73ef98a1b233" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipLoadExample01" Name="__init__.py"   />
-				<File Id="shipLoadExample02" Name="TaskPanel.py"   />
-				<File Id="shipLoadExample03" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipOutlineDraw" Name="shipOutlineDraw" FileSource="../../Mod/Ship/shipOutlineDraw" >
-			<Component Id="CompModshipOutlineDraw"  Guid="a81ec2de-3620-4b33-beaa-2ef14ac642c5" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipOutlineDraw01" Name="__init__.py"   />
-				<File Id="shipOutlineDraw02" Name="Plot.py"   />
-				<File Id="shipOutlineDraw03" Name="Preview.py"   />
-				<File Id="shipOutlineDraw04" Name="TaskPanel.py"   />
-				<File Id="shipOutlineDraw05" Name="TaskPanel.ui"   />
-			</Component>
-		</Directory>
-		<Directory Id="ModshipUtils" Name="shipUtils" FileSource="../../Mod/Ship/shipUtils" >
-			<Component Id="CompModshipUtils"  Guid="7fca3f4d-861a-44fb-ab2e-cd256e3ba9b3" Win64='$(var.Win_64)' KeyPath="yes">
-				<File Id="shipUtils01" Name="__init__.py"   />
-				<File Id="shipUtils02" Name="Locale.py"   />
-				<File Id="shipUtils02" Name="Math.py"   />
-				<File Id="shipUtils03" Name="Paths.py"   />
-				<File Id="shipUtils04" Name="Units.py"   />
-			</Component>
-		</Directory>
-	</Directory>
-</Include>
diff --git a/src/WindowsInstaller/ModSketcher.wxi b/src/WindowsInstaller/ModSketcher.wxi
deleted file mode 100644
index 4714d886f2..0000000000
--- a/src/WindowsInstaller/ModSketcher.wxi
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2009                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2005                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModSketcher" Name="Sketcher" FileSource="../../Mod/Sketcher">
-        <Component Id="CompModSketcher" Guid="bb6ad720-0746-11de-8c30-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="SketcherInitPy" Name="Init.py" DiskId="1" />
-            <File Id="SketcherInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Sketcherpyd" Name="Sketcher.pyd" DiskId="1" />
-            <File Id="SketcherGuipyd" Name="SketcherGui.pyd" DiskId="1" />
-            <File Id="TestSketcherAppPy" Name="TestSketcherApp.py" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModStart.wxi b/src/WindowsInstaller/ModStart.wxi
deleted file mode 100644
index c730abb85b..0000000000
--- a/src/WindowsInstaller/ModStart.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2011                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2011                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModStart" Name="Start" FileSource="../../Mod/Start">
-        <Component Id="CompModStart" Guid="c767e960-864b-11e0-9d78-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="StartInitPy" Name="Init.py" DiskId="1" />
-            <File Id="StartInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="Startpyd" Name="Start.pyd" DiskId="1" />
-            <File Id="StartGuipyd" Name="StartGui.pyd" DiskId="1" />
-        </Component>
-			<Directory Id="ModStartLibStartPage" Name="StartPage" FileSource="../../Mod/Start/StartPage" >
-				<Component Id="CompModStartLibStartPage"  Guid="cd5d0710-864b-11e0-9d78-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="StartPage1" Name="StartPage.py"   />
-					<File Id="StartPage16" Name="__init__.py"   />
-				</Component>
-			</Directory>
-		</Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModTest.wxi b/src/WindowsInstaller/ModTest.wxi
deleted file mode 100644
index d9fef93de1..0000000000
--- a/src/WindowsInstaller/ModTest.wxi
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2005                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2008                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModTest" Name="Test" FileSource="../../Mod/Test">
-        <Component Id="CompModTest" Guid="f962974e-d693-4aeb-a542-87d47cef8461" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="TestInitPy"    	Name="Init.py" DiskId="1" />
-            <File Id="TestInitGuiPy" 	Name="InitGui.py" DiskId="1" />
-            <File Id="TestApp" 			Name="TestApp.py" DiskId="1" />
-            <File Id="TestGui" 			Name="TestGui.py" DiskId="1" />
-            <File Id="TestGuipyd" 		Name="QtUnitGui.pyd" DiskId="1" />
-            <File Id="TestBase" 		Name="BaseTests.py" DiskId="1" />
-            <File Id="TestDocument" 	Name="Document.py" DiskId="1" />
-            <File Id="TestMenu" 		Name="Menu.py" DiskId="1" />
-            <File Id="TestWorkbench" 	Name="Workbench.py" DiskId="1" />
-            <File Id="TestQtUnit" 		Name="qtunittest.py" DiskId="1" />
-            <File Id="TestUnicode" 		Name="UnicodeTests.py" DiskId="1" />
-            <File Id="TestUnit" 		Name="UnitTests.py" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/ModWeb.wxi b/src/WindowsInstaller/ModWeb.wxi
deleted file mode 100644
index b3af0e286b..0000000000
--- a/src/WindowsInstaller/ModWeb.wxi
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   (c) Juergen Riegel (juergen.riegel@web.de) 2011                       
-                                                                        
-   This file is part of the FreeCAD CAx development system.             
-                                                                        
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Library General Public License (LGPL)  
-   as published by the Free Software Foundation; either version 2 of    
-   the License, or (at your option) any later version.                  
-   for detail see the LICENCE text file.                                
-                                                                        
-   FreeCAD is distributed in the hope that it will be useful,           
-   but WITHOUT ANY WARRANTY; without even the implied warranty of       
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
-   GNU Library General Public License for more details.                 
-                                                                        
-   You should have received a copy of the GNU Library General Public    
-   License along with FreeCAD; if not, write to the Free Software       
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
-   USA                                                                  
-                                                                        
-   Juergen Riegel 2011                                                  
--->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Directory Id="ModWeb" Name="Web" FileSource="../../Mod/Web">
-        <Component Id="CompModWeb" Guid="1d920790-8650-11e0-9d78-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
-            <File Id="WebInitPy" Name="Init.py" DiskId="1" />
-            <File Id="WebInitGuiPy" Name="InitGui.py" DiskId="1" />
-            <File Id="WebGuipyd" Name="WebGui.pyd" DiskId="1" />
-        </Component>
-    </Directory>
-</Include>
\ No newline at end of file
diff --git a/src/WindowsInstaller/Version.wxi.in b/src/WindowsInstaller/Version.wxi.in
deleted file mode 100644
index d2cfcd6e58..0000000000
--- a/src/WindowsInstaller/Version.wxi.in
+++ /dev/null
@@ -1,5 +0,0 @@
-<Include>
-   <?define FCVersionMajor =0 ?>
-   <?define FCVersionMinor =14 ?>
-   <?define FCVersionRevision =$WCREV$ ?>
-</Include>