[med-svn] [beast-mcmc] 02/03: Imported Upstream version 1.8.4+dfsg.1

Andreas Tille tille at debian.org
Fri Jul 1 12:53:43 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository beast-mcmc.

commit c43ea5aa8aca073467d5e06d919a9fef8e207165
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 1 14:26:56 2016 +0200

    Imported Upstream version 1.8.4+dfsg.1
---
 packaging_tools/mac/universalJavaApplicationStub   |  308 ------
 packaging_tools/windows/launch4j/.classpath        |   17 -
 packaging_tools/windows/launch4j/.gitignore        |    2 -
 packaging_tools/windows/launch4j/.project          |   17 -
 .../.settings/org.eclipse.core.resources.prefs     |    2 -
 .../.settings/org.eclipse.core.runtime.prefs       |    2 -
 .../launch4j/.settings/org.eclipse.jdt.core.prefs  |   81 --
 packaging_tools/windows/launch4j/LICENSE.txt       |   30 -
 packaging_tools/windows/launch4j/build.xml         |   73 --
 .../windows/launch4j/demo/ConsoleApp/.gitignore    |    1 -
 .../windows/launch4j/demo/ConsoleApp/build.xml     |   57 -
 .../launch4j/demo/ConsoleApp/l4j/ConsoleApp.ico    |  Bin 766 -> 0 bytes
 .../launch4j/demo/ConsoleApp/lib/readme.txt        |    8 -
 .../windows/launch4j/demo/ConsoleApp/readme.txt    |    1 -
 .../src/net/sf/launch4j/example/ConsoleApp.java    |   72 --
 packaging_tools/windows/launch4j/demo/LICENSE.txt  |   30 -
 .../windows/launch4j/demo/SimpleApp/.gitignore     |    1 -
 .../windows/launch4j/demo/SimpleApp/build.xml      |   52 -
 .../launch4j/demo/SimpleApp/l4j/SimpleApp.ico      |  Bin 766 -> 0 bytes
 .../launch4j/demo/SimpleApp/l4j/SimpleApp.xml      |   18 -
 .../windows/launch4j/demo/SimpleApp/l4j/splash.bmp |  Bin 4514 -> 0 bytes
 .../windows/launch4j/demo/SimpleApp/lib/readme.txt |    8 -
 .../windows/launch4j/demo/SimpleApp/readme.txt     |    1 -
 .../src/net/sf/launch4j/example/SimpleApp.java     |  122 --
 packaging_tools/windows/launch4j/demo/readme.txt   |    3 -
 packaging_tools/windows/launch4j/head/LICENSE.txt  |   26 -
 .../windows/launch4j/head_src/LICENSE.txt          |   26 -
 .../launch4j/head_src/consolehead/.gitignore       |    2 -
 .../launch4j/head_src/consolehead/Makefile.win     |   33 -
 .../launch4j/head_src/consolehead/consolehead.c    |   97 --
 .../launch4j/head_src/consolehead/consolehead.dev  |  108 --
 .../windows/launch4j/head_src/guihead/.gitignore   |    2 -
 .../windows/launch4j/head_src/guihead/Makefile.win |   33 -
 .../windows/launch4j/head_src/guihead/guihead.c    |  240 ----
 .../windows/launch4j/head_src/guihead/guihead.dev  |  109 --
 .../windows/launch4j/head_src/guihead/guihead.h    |   43 -
 packaging_tools/windows/launch4j/head_src/head.c   | 1167 --------------------
 packaging_tools/windows/launch4j/head_src/head.h   |  136 ---
 .../windows/launch4j/head_src/resource.h           |   75 --
 packaging_tools/windows/launch4j/launch4j          |    7 -
 packaging_tools/windows/launch4j/launch4j.jfpr     |  Bin 125 -> 0 bytes
 .../launch4j/lib/JGoodies.Forms.LICENSE.txt        |   31 -
 .../launch4j/lib/JGoodies.Looks.LICENSE.txt        |   31 -
 .../launch4j/lib/Nuvola.Icon.Theme.LICENSE.txt     |  504 ---------
 .../windows/launch4j/lib/XStream.LICENSE.txt       |   27 -
 .../windows/launch4j/lib/ant.LICENSE.txt           |  201 ----
 .../windows/launch4j/lib/commons.LICENSE.txt       |   50 -
 .../windows/launch4j/lib/foxtrot.LICENSE.txt       |   25 -
 .../windows/launch4j/manifest/uac.exe.manifest     |   12 -
 packaging_tools/windows/launch4j/maven/.classpath  |   24 -
 packaging_tools/windows/launch4j/maven/.project    |   23 -
 .../maven/.settings/org.eclipse.m2e.core.prefs     |    4 -
 .../launch4j/maven/assembly/assemble-dist.xml      |   14 -
 .../launch4j/maven/assembly/assemble-linux.xml     |   51 -
 .../launch4j/maven/assembly/assemble-mac.xml       |   51 -
 .../launch4j/maven/assembly/assemble-solaris.xml   |   51 -
 .../launch4j/maven/assembly/assemble-win32.xml     |   52 -
 .../windows/launch4j/maven/assembly/src.xml        |   55 -
 .../windows/launch4j/maven/maven-readme.txt        |   10 -
 packaging_tools/windows/launch4j/maven/pom.xml     |  518 ---------
 packaging_tools/windows/launch4j/sign4j/README.txt |   18 -
 packaging_tools/windows/launch4j/sign4j/sign4j.c   |  259 -----
 packaging_tools/windows/launch4j/src/LICENSE.txt   |   30 -
 .../windows/launch4j/src/images/asterix-o.gif      |  Bin 51 -> 0 bytes
 .../windows/launch4j/src/images/asterix.gif        |  Bin 53 -> 0 bytes
 .../windows/launch4j/src/images/build.png          |  Bin 1607 -> 0 bytes
 .../windows/launch4j/src/images/button_ok.png      |  Bin 883 -> 0 bytes
 .../windows/launch4j/src/images/cancel16.png       |  Bin 1133 -> 0 bytes
 .../windows/launch4j/src/images/down16.png         |  Bin 912 -> 0 bytes
 .../windows/launch4j/src/images/edit_add16.png     |  Bin 1088 -> 0 bytes
 .../windows/launch4j/src/images/info.png           |  Bin 1397 -> 0 bytes
 .../windows/launch4j/src/images/new.png            |  Bin 1145 -> 0 bytes
 .../windows/launch4j/src/images/new16.png          |  Bin 805 -> 0 bytes
 .../windows/launch4j/src/images/ok16.png           |  Bin 883 -> 0 bytes
 .../windows/launch4j/src/images/open.png           |  Bin 1412 -> 0 bytes
 .../windows/launch4j/src/images/open16.png         |  Bin 513 -> 0 bytes
 .../windows/launch4j/src/images/run.png            |  Bin 1159 -> 0 bytes
 .../windows/launch4j/src/images/save.png           |  Bin 1182 -> 0 bytes
 .../windows/launch4j/src/images/up16.png           |  Bin 906 -> 0 bytes
 .../windows/launch4j/src/launch4j.properties       |    2 -
 .../launch4j/src/net/sf/launch4j/Builder.java      |  214 ----
 .../src/net/sf/launch4j/BuilderException.java      |   52 -
 .../src/net/sf/launch4j/ExecException.java         |   66 --
 .../src/net/sf/launch4j/FileChooserFilter.java     |   76 --
 .../net/sf/launch4j/KanjiEscapeOutputStream.java   |   86 --
 .../windows/launch4j/src/net/sf/launch4j/Log.java  |  105 --
 .../windows/launch4j/src/net/sf/launch4j/Main.java |   94 --
 .../launch4j/src/net/sf/launch4j/Messages.java     |   78 --
 .../launch4j/src/net/sf/launch4j/RcBuilder.java    |  408 -------
 .../windows/launch4j/src/net/sf/launch4j/Util.java |  220 ----
 .../src/net/sf/launch4j/ant/AntClassPath.java      |   63 --
 .../src/net/sf/launch4j/ant/AntConfig.java         |  131 ---
 .../launch4j/src/net/sf/launch4j/ant/AntJre.java   |   69 --
 .../src/net/sf/launch4j/ant/Launch4jTask.java      |  162 ---
 .../launch4j/src/net/sf/launch4j/ant/Messages.java |   55 -
 .../src/net/sf/launch4j/ant/StringWrapper.java     |   69 --
 .../src/net/sf/launch4j/ant/messages.properties    |   35 -
 .../src/net/sf/launch4j/ant/messages_es.properties |   35 -
 .../src/net/sf/launch4j/binding/Binding.java       |   62 --
 .../net/sf/launch4j/binding/BindingException.java  |   52 -
 .../src/net/sf/launch4j/binding/Bindings.java      |  333 ------
 .../src/net/sf/launch4j/binding/IValidatable.java  |   44 -
 .../binding/InvariantViolationException.java       |   67 --
 .../net/sf/launch4j/binding/JComboBoxBinding.java  |  119 --
 .../src/net/sf/launch4j/binding/JListBinding.java  |  121 --
 .../sf/launch4j/binding/JRadioButtonBinding.java   |  146 ---
 .../net/sf/launch4j/binding/JTextAreaBinding.java  |  128 ---
 .../sf/launch4j/binding/JTextComponentBinding.java |  108 --
 .../sf/launch4j/binding/JToggleButtonBinding.java  |  108 --
 .../src/net/sf/launch4j/binding/Messages.java      |   78 --
 .../sf/launch4j/binding/OptComponentBinding.java   |  122 --
 .../sf/launch4j/binding/OptJTextAreaBinding.java   |  146 ---
 .../src/net/sf/launch4j/binding/Validator.java     |  252 -----
 .../net/sf/launch4j/binding/messages.properties    |   52 -
 .../net/sf/launch4j/binding/messages_es.properties |   51 -
 .../src/net/sf/launch4j/config/ClassPath.java      |   92 --
 .../src/net/sf/launch4j/config/Config.java         |  395 -------
 .../net/sf/launch4j/config/ConfigPersister.java    |  276 -----
 .../launch4j/config/ConfigPersisterException.java  |   51 -
 .../launch4j/src/net/sf/launch4j/config/Jre.java   |  292 -----
 .../src/net/sf/launch4j/config/LdDefaults.java     |   62 --
 .../src/net/sf/launch4j/config/Messages.java       |   78 --
 .../launch4j/src/net/sf/launch4j/config/Msg.java   |  111 --
 .../src/net/sf/launch4j/config/SingleInstance.java |   74 --
 .../src/net/sf/launch4j/config/Splash.java         |  103 --
 .../src/net/sf/launch4j/config/VersionInfo.java    |  168 ---
 .../src/net/sf/launch4j/config/messages.properties |   96 --
 .../net/sf/launch4j/config/messages_es.properties  |   75 --
 .../src/net/sf/launch4j/form/BasicForm.java        |  284 -----
 .../src/net/sf/launch4j/form/BasicForm.jfrm        |  Bin 18500 -> 0 bytes
 .../src/net/sf/launch4j/form/ClassPathForm.java    |  193 ----
 .../src/net/sf/launch4j/form/ClassPathForm.jfrm    |  Bin 10059 -> 0 bytes
 .../src/net/sf/launch4j/form/ConfigForm.java       |  132 ---
 .../src/net/sf/launch4j/form/ConfigForm.jfrm       |  Bin 4477 -> 0 bytes
 .../net/sf/launch4j/form/EnvironmentVarsForm.java  |  127 ---
 .../net/sf/launch4j/form/EnvironmentVarsForm.jfrm  |  Bin 3813 -> 0 bytes
 .../src/net/sf/launch4j/form/HeaderForm.java       |  171 ---
 .../src/net/sf/launch4j/form/HeaderForm.jfrm       |  Bin 7298 -> 0 bytes
 .../launch4j/src/net/sf/launch4j/form/JreForm.java |  307 -----
 .../launch4j/src/net/sf/launch4j/form/JreForm.jfrm |  Bin 20189 -> 0 bytes
 .../src/net/sf/launch4j/form/Messages.java         |   55 -
 .../src/net/sf/launch4j/form/MessagesForm.java     |  183 ---
 .../src/net/sf/launch4j/form/MessagesForm.jfrm     |  Bin 9184 -> 0 bytes
 .../net/sf/launch4j/form/SingleInstanceForm.java   |  141 ---
 .../net/sf/launch4j/form/SingleInstanceForm.jfrm   |  Bin 5246 -> 0 bytes
 .../src/net/sf/launch4j/form/SplashForm.java       |  166 ---
 .../src/net/sf/launch4j/form/SplashForm.jfrm       |  Bin 7347 -> 0 bytes
 .../src/net/sf/launch4j/form/VersionInfoForm.java  |  232 ----
 .../src/net/sf/launch4j/form/VersionInfoForm.jfrm  |  Bin 13722 -> 0 bytes
 .../src/net/sf/launch4j/form/messages.properties   |  152 ---
 .../net/sf/launch4j/form/messages_es.properties    |  117 --
 .../launch4j/formimpl/AbstractAcceptListener.java  |   75 --
 .../net/sf/launch4j/formimpl/BasicFormImpl.java    |  101 --
 .../sf/launch4j/formimpl/BrowseActionListener.java |   79 --
 .../sf/launch4j/formimpl/ClassPathFormImpl.java    |  222 ----
 .../net/sf/launch4j/formimpl/ConfigFormImpl.java   |  100 --
 .../launch4j/formimpl/EnvironmentVarsFormImpl.java |   50 -
 .../src/net/sf/launch4j/formimpl/FileChooser.java  |   66 --
 .../src/net/sf/launch4j/formimpl/GlassPane.java    |   67 --
 .../net/sf/launch4j/formimpl/HeaderFormImpl.java   |  102 --
 .../src/net/sf/launch4j/formimpl/JreFormImpl.java  |  175 ---
 .../src/net/sf/launch4j/formimpl/MainFrame.java    |  360 ------
 .../src/net/sf/launch4j/formimpl/Messages.java     |   55 -
 .../net/sf/launch4j/formimpl/MessagesFormImpl.java |   58 -
 .../launch4j/formimpl/SingleInstanceFormImpl.java  |   54 -
 .../net/sf/launch4j/formimpl/SplashFormImpl.java   |   61 -
 .../sf/launch4j/formimpl/VersionInfoFormImpl.java  |   63 --
 .../net/sf/launch4j/formimpl/messages.properties   |   80 --
 .../sf/launch4j/formimpl/messages_es.properties    |   56 -
 .../src/net/sf/launch4j/messages.properties        |   45 -
 .../src/net/sf/launch4j/messages_es.properties     |   44 -
 .../windows/launch4j/w32api/MinGW.LICENSE.txt      |   25 -
 .../windows/launch4j/w32api/libadvapi32.a          |  Bin 410156 -> 0 bytes
 packaging_tools/windows/launch4j/w32api/libgcc.a   |  Bin 53694 -> 0 bytes
 .../windows/launch4j/w32api/libkernel32.a          |  Bin 655198 -> 0 bytes
 .../windows/launch4j/w32api/libmingw32.a           |  Bin 6802 -> 0 bytes
 .../windows/launch4j/w32api/libmsvcrt.a            |  Bin 503692 -> 0 bytes
 .../windows/launch4j/w32api/libshell32.a           |  Bin 141600 -> 0 bytes
 .../windows/launch4j/w32api/libuser32.a            |  Bin 472426 -> 0 bytes
 packaging_tools/windows/launch4j/web/bullet.gif    |  Bin 151 -> 0 bytes
 .../windows/launch4j/web/changelog.html            |  434 --------
 packaging_tools/windows/launch4j/web/docs.html     |  668 -----------
 packaging_tools/windows/launch4j/web/index.html    |  122 --
 .../windows/launch4j/web/launch4j-use.gif          |  Bin 12724 -> 0 bytes
 packaging_tools/windows/launch4j/web/launch4j.gif  |  Bin 3460 -> 0 bytes
 packaging_tools/windows/launch4j/web/links.html    |   60 -
 packaging_tools/windows/launch4j/web/style.css     |  166 ---
 187 files changed, 16581 deletions(-)

diff --git a/packaging_tools/mac/universalJavaApplicationStub b/packaging_tools/mac/universalJavaApplicationStub
deleted file mode 100644
index 686db22..0000000
--- a/packaging_tools/mac/universalJavaApplicationStub
+++ /dev/null
@@ -1,308 +0,0 @@
-#!/bin/sh
-##################################################################################
-#                                                                                #
-# universalJavaApplicationStub                                                   #
-#                                                                                #
-#                                                                                #
-# A shellscript JavaApplicationStub for Java Apps on Mac OS X                    #
-# that works with both Apple's and Oracle's plist format.                        #
-#                                                                                #
-# Inspired by Ian Roberts stackoverflow answer                                   #
-# at http://stackoverflow.com/a/17546508/1128689                                 #
-#                                                                                #
-#                                                                                #
-# @author    Tobias Fischer                                                      #
-# @url       https://github.com/tofi86/universalJavaApplicationStub              #
-# @date      2015-05-15                                                          #
-# @version   0.9.0                                                               #
-#                                                                                #
-#                                                                                #
-##################################################################################
-#                                                                                #
-#                                                                                #
-# The MIT License (MIT)                                                          #
-#                                                                                #
-# Copyright (c) 2015 Tobias Fischer                                              #
-#                                                                                #
-# Permission is hereby granted, free of charge, to any person obtaining a copy   #
-# of this software and associated documentation files (the "Software"), to deal  #
-# in the Software without restriction, including without limitation the rights   #
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell      #
-# copies of the Software, and to permit persons to whom the Software is          #
-# furnished to do so, subject to the following conditions:                       #
-#                                                                                #
-# The above copyright notice and this permission notice shall be included in all #
-# copies or substantial portions of the Software.                                #
-#                                                                                #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR     #
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,       #
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE    #
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER         #
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,  #
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE  #
-# SOFTWARE.                                                                      #
-#                                                                                #
-##################################################################################
-
-
-
-
-#
-# resolve symlinks
-#####################
-
-PRG=$0
-
-while [ -h "$PRG" ]; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
-    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
-        PRG="$link"
-    else
-        PRG="`dirname "$PRG"`/$link"
-    fi
-done
-
-# set the directory abspath of the current shell script
-PROGDIR=`dirname "$PRG"`
-
-
-
-
-#
-# set files and folders
-############################################
-
-# the absolute path of the app package
-cd "$PROGDIR"/../../
-AppPackageFolder=`pwd`
-
-# the base path of the app package
-cd ..
-AppPackageRoot=`pwd`
-
-# set Apple's Java folder
-AppleJavaFolder="${AppPackageFolder}"/Contents/Resources/Java
-
-# set Apple's Resources folder
-AppleResourcesFolder="${AppPackageFolder}"/Contents/Resources
-
-# set Oracle's Java folder
-OracleJavaFolder="${AppPackageFolder}"/Contents/Java
-
-# set Oracle's Resources folder
-OracleResourcesFolder="${AppPackageFolder}"/Contents/Resources
-
-# set path to Info.plist in bundle
-InfoPlistFile="${AppPackageFolder}"/Contents/Info.plist
-
-# set the default JVM Version to a null string
-JVMVersion=""
-
-
-
-#
-# read Info.plist and extract JVM options
-############################################
-
-
-# read the program name from CFBundleName
-CFBundleName=`/usr/libexec/PlistBuddy -c "print :CFBundleName" "${InfoPlistFile}"`
-
-# read the icon file name
-CFBundleIconFile=`/usr/libexec/PlistBuddy -c "print :CFBundleIconFile" "${InfoPlistFile}"`
-
-
-# check Info.plist for Apple style Java keys -> if key :Java is present, parse in apple mode
-/usr/libexec/PlistBuddy -c "print :Java" "${InfoPlistFile}" > /dev/null 2>&1
-exitcode=$?
-JavaKey=":Java"
-
-# if no :Java key is present, check Info.plist for universalJavaApplication style JavaX keys -> if key :JavaX is present, parse in apple mode
-if [ $exitcode -ne 0 ]; then
-	/usr/libexec/PlistBuddy -c "print :JavaX" "${InfoPlistFile}" > /dev/null 2>&1
-	exitcode=$?
-	JavaKey=":JavaX"
-fi
-
-
-# read Info.plist in Apple style if exit code returns 0 (true, :Java key is present)
-if [ $exitcode -eq 0 ]; then
-
-	# set Java and Resources folder
-	JavaFolder="${AppleJavaFolder}"
-	ResourcesFolder="${AppleResourcesFolder}"
-
-	APP_PACKAGE="${AppPackageFolder}"
-	JAVAROOT="${AppleJavaFolder}"
-	USER_HOME="$HOME"
-
-
-	# read the Java WorkingDirectory
-	JVMWorkDir=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:WorkingDirectory" "${InfoPlistFile}" 2> /dev/null | xargs`
-	
-	# set Working Directory based upon Plist info
-	if [[ ! -z ${JVMWorkDir} ]]; then
-		WorkingDirectory="${JVMWorkDir}"
-	else
-		# AppPackageRoot is the standard WorkingDirectory when the script is started
-		WorkingDirectory="${AppPackageRoot}"
-	fi
-
-	# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
-	WorkingDirectory=`eval "echo ${WorkingDirectory}"`
-
-
-	# read the MainClass name
-	JVMMainClass=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:MainClass" "${InfoPlistFile}" 2> /dev/null`
-
-	# read the JVM Options
-	JVMOptions=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:Properties" "${InfoPlistFile}" 2> /dev/null | grep " =" | sed 's/^ */-D/g' | tr '\n' ' ' | sed 's/  */ /g' | sed 's/ = /=/g' | xargs`
-
-	# read StartOnMainThread
-	JVMStartOnMainThread=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:StartOnMainThread" "${InfoPlistFile}" 2> /dev/null`
-	if [ "${JVMStartOnMainThread}" == "true" ]; then
-		echo ${JVMStartOnMainThread} > ~/Desktop/test.txt
-		JVMOptions+=" -XstartOnFirstThread"
-	fi
-
-	# read the ClassPath in either Array or String style
-	JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:ClassPath" "${InfoPlistFile}" 2> /dev/null`
-	if [[ $JVMClassPath_RAW == *Array* ]] ; then
-		JVMClassPath=.`/usr/libexec/PlistBuddy -c "print ${JavaKey}:ClassPath" "${InfoPlistFile}" 2> /dev/null | grep "    " | sed 's/^ */:/g' | tr -d '\n' | xargs`
-	else
-		JVMClassPath=${JVMClassPath_RAW}
-	fi
-	# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
-	JVMClassPath=`eval "echo ${JVMClassPath}"`
-
-	# read the JVM Default Options
-	JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:VMOptions" "${InfoPlistFile}" 2> /dev/null | xargs`
-
-	# read the JVM Arguments
-	JVMArguments=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:Arguments" "${InfoPlistFile}" 2> /dev/null | xargs`
-
-    # read the Java version we want to find
-    JVMVersion=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:JVMVersion" "${InfoPlistFile}" 2> /dev/null | xargs`
-
-# read Info.plist in Oracle style
-else
-
-	# set Working Directory and Java and Resources folder
-	JavaFolder="${OracleJavaFolder}"
-	ResourcesFolder="${OracleResourcesFolder}"
-	WorkingDirectory="${OracleJavaFolder}"
-
-	APP_ROOT="${AppPackageFolder}"
-
-	# read the MainClass name
-	JVMMainClass=`/usr/libexec/PlistBuddy -c "print :JVMMainClassName" "${InfoPlistFile}" 2> /dev/null`
-
-	# read the JVM Options
-	JVMOptions=`/usr/libexec/PlistBuddy -c "print :JVMOptions" "${InfoPlistFile}" 2> /dev/null | grep " -" | tr -d '\n' | sed 's/  */ /g' | xargs`
-	# replace occurances of $APP_ROOT with it's content
-	JVMOptions=`eval "echo ${JVMOptions}"`
-
-	JVMClassPath="${JavaFolder}/*"
-
-	# read the JVM Default Options
-	JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print :JVMDefaultOptions" "${InfoPlistFile}" 2> /dev/null | grep -o "\-.*" | tr -d '\n' | xargs`
-
-	# read the JVM Arguments
-	JVMArguments=`/usr/libexec/PlistBuddy -c "print :JVMArguments" "${InfoPlistFile}" 2> /dev/null | tr -d '\n' | sed -E 's/Array \{ *(.*) *\}/\1/g' | sed 's/  */ /g' | xargs`
-	# replace occurances of $APP_ROOT with it's content
-	JVMArguments=`eval "echo ${JVMArguments}"`
-fi
-
-
-
-
-#
-# find installed Java versions
-#################################
-
-# first check system variable "$JAVA_HOME"
-if [ -n "$JAVA_HOME" ] ; then
-	JAVACMD="$JAVA_HOME/bin/java"
-	
-# check for specified JVMversion in "/usr/libexec/java_home" symlinks
-elif [ ! -z ${JVMVersion} ] && [ -x /usr/libexec/java_home ] && /usr/libexec/java_home -F; then
-
-	if /usr/libexec/java_home -F -v ${JVMVersion}; then
-		JAVACMD="`/usr/libexec/java_home -F -v ${JVMVersion} 2> /dev/null`/bin/java"
-	else
-		# display error message with applescript
-		osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'\n\nNo suitable Java version found on your system!\nThis program requires Java ${JVMVersion}\nMake sure you install the required Java version.\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
-		# exit with error
-		exit 3
-	fi
-
-# otherwise check "/usr/libexec/java_home" symlinks
-elif [ -x /usr/libexec/java_home ] && /usr/libexec/java_home -F; then
-	JAVACMD="`/usr/libexec/java_home 2> /dev/null`/bin/java"
-
-# otherwise check Java standard symlink (old Apple Java)
-elif [ -h /Library/Java/Home ]; then
-	JAVACMD="/Library/Java/Home/bin/java"
-
-# fallback: public JRE plugin (Oracle Java)
-else
-	JAVACMD="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
-fi
-
-# fallback fallback: /usr/bin/java
-# but this would prompt to install deprecated Apple Java 6
-
-
-
-
-#
-# execute JAVA commandline and do some pre-checks
-####################################################
-
-# display error message if MainClassName is empty
-if [ -z ${JVMMainClass} ]; then
-	# display error message with applescript
-	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\n'MainClass' isn't specified!\nJava application cannot be started!\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
-	# exit with error
-	exit 2
-
-
-# check whether $JAVACMD is a file and executable
-elif [ -f "$JAVACMD" ] && [ -x "$JAVACMD" ] ; then
-
-	# enable drag&drop to the dock icon
-	export CFProcessPath="$0"
-
-	# change to Working Directory based upon Apple/Oracle Plist info
-	cd "${WorkingDirectory}"
-
-	# execute Java and set
-	#	- classpath
-	#	- dock icon
-	#	- application name
-	#	- JVM options
-	#	- JVM default options
-	#	- main class
-	#	- JVM arguments
-	exec "$JAVACMD" \
-			-cp "${JVMClassPath}" \
-			-Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \
-			-Xdock:name="${CFBundleName}" \
-			${JVMOptions:+$JVMOptions }\
-			${JVMDefaultOptions:+$JVMDefaultOptions }\
-			${JVMMainClass}\
-			${JVMArguments:+ $JVMArguments}
-
-
-else
-
-	# display error message with applescript
-	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\nYou need to have JAVA installed on your Mac!\nVisit http://java.com for more information...\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
-
-	# and open java.com
-	open http://java.com
-
-	# exit with error
-	exit 1
-fi
diff --git a/packaging_tools/windows/launch4j/.classpath b/packaging_tools/windows/launch4j/.classpath
deleted file mode 100644
index 36815f9..0000000
--- a/packaging_tools/windows/launch4j/.classpath
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" output="demo/SimpleApp/build" path="demo/SimpleApp/src"/>
-	<classpathentry kind="src" output="demo/ConsoleApp/build" path="demo/ConsoleApp/src"/>
-	<classpathentry kind="lib" path="lib/formsrt.jar"/>
-	<classpathentry kind="lib" path="lib/xstream.jar"/>
-	<classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/foxtrot.jar"/>
-	<classpathentry kind="lib" path="lib/ant.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6"/>
-	<classpathentry kind="lib" path="lib/jgoodies-common.jar"/>
-	<classpathentry kind="lib" path="lib/jgoodies-forms.jar"/>
-	<classpathentry kind="lib" path="lib/jgoodies-looks.jar"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>
diff --git a/packaging_tools/windows/launch4j/.gitignore b/packaging_tools/windows/launch4j/.gitignore
deleted file mode 100644
index c3dca1b..0000000
--- a/packaging_tools/windows/launch4j/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/target
diff --git a/packaging_tools/windows/launch4j/.project b/packaging_tools/windows/launch4j/.project
deleted file mode 100644
index 0607fa0..0000000
--- a/packaging_tools/windows/launch4j/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>launch4j</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/packaging_tools/windows/launch4j/.settings/org.eclipse.core.resources.prefs b/packaging_tools/windows/launch4j/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/packaging_tools/windows/launch4j/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/packaging_tools/windows/launch4j/.settings/org.eclipse.core.runtime.prefs b/packaging_tools/windows/launch4j/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/packaging_tools/windows/launch4j/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/packaging_tools/windows/launch4j/.settings/org.eclipse.jdt.core.prefs b/packaging_tools/windows/launch4j/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c52892e..0000000
--- a/packaging_tools/windows/launch4j/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,81 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/packaging_tools/windows/launch4j/LICENSE.txt b/packaging_tools/windows/launch4j/LICENSE.txt
deleted file mode 100644
index bf03c83..0000000
--- a/packaging_tools/windows/launch4j/LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (c) 2004, 2015 Grzegorz Kowal
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/packaging_tools/windows/launch4j/build.xml b/packaging_tools/windows/launch4j/build.xml
deleted file mode 100644
index cc6de16..0000000
--- a/packaging_tools/windows/launch4j/build.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<project name="launch4j" default="compile" basedir=".">
-	<property name="src" location="src" />
-	<property name="lib" location="lib" />
-	<property name="build" location="build" />
-	<property name="jar" location="./${ant.project.name}.jar" />
-	<property name="launch4j.dir" location="." />
-	<property name="maven" location="maven" />
-
-	<path id="dist.classpath">
-		<pathelement path="${build}" />
-		<fileset dir="${lib}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<target name="init">
-		<tstamp />
-		<mkdir dir="${build}" />
-	</target>
-
-	<target name="compile" depends="init" description="compile the source">
-		<javac srcdir="${src}" destdir="${build}" classpathref="dist.classpath" source="1.6" debug="on" includeantruntime="false" />
-		<copy todir="${build}/images">
-			<fileset dir="${src}/images">
-				<include name="**/*" />
-			</fileset>
-		</copy>
-		<copy todir="${build}">
-			<fileset dir="${src}">
-				<include name="**/*.properties" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="jar" depends="compile" description="create jar">
-		<fileset dir="${lib}" id="lib.dist.fileset">
-			<include name="**/*.jar" />
-		</fileset>
-		<pathconvert pathsep=" " property="dist.classpath" refid="lib.dist.fileset">
-			<map from="${lib}" to="./lib" />
-		</pathconvert>
-		<!-- Put everything in ${build} into a jar file -->
-		<jar jarfile="${jar}">
-			<fileset dir="${build}" excludes="**/messages_es.properties" />
-			<manifest>
-				<attribute name="Main-Class" value="net.sf.launch4j.Main" />
-				<attribute name="Class-Path" value=". ${dist.classpath}" />
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="demo" depends="jar" description="build the demos">
-		<ant dir="./demo/ConsoleApp" inheritAll="false" />
-		<ant dir="./demo/SimpleApp" inheritAll="false" />
-	</target>
-
-	<target name="clean" description="clean up">
-		<delete dir="${build}" />
-		<delete file="${jar}" />
-		<ant dir="./demo/ConsoleApp" target="clean" inheritAll="false" />
-		<ant dir="./demo/SimpleApp" target="clean" inheritAll="false" />
-	</target>
-	
-	<target name="switch-to-maven" description="switch project to maven">
-		<copy todir="." overwrite="true">
-			<fileset dir="${maven}">
-				<include name="**/*" />
-			</fileset>
-		</copy>
-		<delete dir="${lib}" />
-		<mkdir dir="./target" />
-	</target>
-</project>
diff --git a/packaging_tools/windows/launch4j/demo/ConsoleApp/.gitignore b/packaging_tools/windows/launch4j/demo/ConsoleApp/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/packaging_tools/windows/launch4j/demo/ConsoleApp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/packaging_tools/windows/launch4j/demo/ConsoleApp/build.xml b/packaging_tools/windows/launch4j/demo/ConsoleApp/build.xml
deleted file mode 100644
index 78be0ae..0000000
--- a/packaging_tools/windows/launch4j/demo/ConsoleApp/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<project name="ConsoleApp" default="exe" basedir=".">
-	<property name="src" location="src" />
-	<property name="lib" location="lib" />
-	<property name="build" location="build" />
-	<property name="launch4j.dir" location="../.." />
-
-	<path id="dist.classpath">
-		<pathelement path="${build}" />
-		<fileset dir="${lib}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<target name="init">
-		<tstamp />
-		<mkdir dir="${build}" />
-	</target>
-
-	<target name="compile" depends="init" description="compile the source">
-		<javac srcdir="${src}" destdir="${build}" classpathref="dist.classpath" source="1.6" debug="on" includeantruntime="false" />
-	</target>
-
-	<target name="jar" depends="compile" description="create the jar">
-		<fileset dir="${lib}" id="lib.dist.fileset">
-			<include name="**/*.jar" />
-		</fileset>
-		<pathconvert pathsep=" " property="dist.classpath" refid="lib.dist.fileset">
-			<map from="${lib}" to=".\lib" />
-		</pathconvert>
-		<!-- Put everything in ${build} into a jar file -->
-		<jar jarfile="${ant.project.name}.jar">
-			<fileset dir="${build}" includes="**/*" />
-			<manifest>
-				<!-- SET YOUR MAIN CLASS HERE -->
-				<attribute name="Main-Class" value="net.sf.launch4j.example.ConsoleApp" />
-				<attribute name="Class-Path" value=". ${dist.classpath}" />
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="exe" depends="jar">
-		<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask" classpath="${launch4j.dir}/launch4j.jar
-		    :${launch4j.dir}/lib/xstream.jar" />
-		<launch4j>
-			<config headerType="console" jar="ConsoleApp.jar" outfile="ConsoleApp.exe" errTitle="ConsoleApp" chdir="." icon="l4j/ConsoleApp.ico">
-				<singleInstance mutexName="net.sf.launch4j.example.ConsoleApp" />
-				<jre minVersion="1.6.0" />
-			</config>
-		</launch4j>
-	</target>
-
-	<target name="clean" description="clean up">
-		<delete dir="${build}" />
-		<delete file="${ant.project.name}.jar" />
-		<delete file="${ant.project.name}.exe" />
-	</target>
-</project>
diff --git a/packaging_tools/windows/launch4j/demo/ConsoleApp/l4j/ConsoleApp.ico b/packaging_tools/windows/launch4j/demo/ConsoleApp/l4j/ConsoleApp.ico
deleted file mode 100644
index cc4c540..0000000
Binary files a/packaging_tools/windows/launch4j/demo/ConsoleApp/l4j/ConsoleApp.ico and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/demo/ConsoleApp/lib/readme.txt b/packaging_tools/windows/launch4j/demo/ConsoleApp/lib/readme.txt
deleted file mode 100644
index a40a6b9..0000000
--- a/packaging_tools/windows/launch4j/demo/ConsoleApp/lib/readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Put your jar libs here and the build script will include them
-in the classpath stored inside the jar manifest.
-In order to run your application move the output exe file from
-the dist directory to the same level as lib. 
-
-SimpleApp.exe
-lib/
-lib/xml.jar
diff --git a/packaging_tools/windows/launch4j/demo/ConsoleApp/readme.txt b/packaging_tools/windows/launch4j/demo/ConsoleApp/readme.txt
deleted file mode 100644
index f971cd6..0000000
--- a/packaging_tools/windows/launch4j/demo/ConsoleApp/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-To build the example application set JAVA_HOME and ANT_HOME environment variables.
diff --git a/packaging_tools/windows/launch4j/demo/ConsoleApp/src/net/sf/launch4j/example/ConsoleApp.java b/packaging_tools/windows/launch4j/demo/ConsoleApp/src/net/sf/launch4j/example/ConsoleApp.java
deleted file mode 100644
index 57dd324..0000000
--- a/packaging_tools/windows/launch4j/demo/ConsoleApp/src/net/sf/launch4j/example/ConsoleApp.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j.example;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class ConsoleApp {
-    public static void main(String[] args) {
-		StringBuffer sb = new StringBuffer("Hello World!\n\nJava version: ");
-		sb.append(System.getProperty("java.version"));
-		sb.append("\nJava home: ");
-		sb.append(System.getProperty("java.home"));
-		sb.append("\nCurrent dir: ");
-		sb.append(System.getProperty("user.dir"));
-		if (args.length > 0) {
-			sb.append("\nArgs: ");
-			for (int i = 0; i < args.length; i++) {
-				sb.append(args[i]);
-				sb.append(' ');
-			}
-		}
-		sb.append("\n\nEnter a line of text, 'quit' or Ctrl-C to stop.\n\n>");
-		System.out.print(sb.toString());
-		try {
-			BufferedReader is = new BufferedReader(new InputStreamReader(System.in));
-			String line;
-			while ((line = is.readLine()) != null && !line.equalsIgnoreCase("quit")) {
-				System.out.print("You wrote: " + line + "\n\n>");
-			}
-			is.close();
-			System.exit(123);
-		} catch (IOException e) {
-			System.err.print(e);
-		}
-    }
-}
diff --git a/packaging_tools/windows/launch4j/demo/LICENSE.txt b/packaging_tools/windows/launch4j/demo/LICENSE.txt
deleted file mode 100644
index b778408..0000000
--- a/packaging_tools/windows/launch4j/demo/LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (c) 2004, 2015 Grzegorz Kowal
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/.gitignore b/packaging_tools/windows/launch4j/demo/SimpleApp/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/packaging_tools/windows/launch4j/demo/SimpleApp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/build.xml b/packaging_tools/windows/launch4j/demo/SimpleApp/build.xml
deleted file mode 100644
index 9b6aae0..0000000
--- a/packaging_tools/windows/launch4j/demo/SimpleApp/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project name="SimpleApp" default="exe" basedir=".">
-	<property name="src" location="src" />
-	<property name="lib" location="lib" />
-	<property name="build" location="build" />
-	<property name="launch4j.dir" location="../.." />
-
-	<path id="dist.classpath">
-		<pathelement path="${build}" />
-		<fileset dir="${lib}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<target name="init">
-		<tstamp />
-		<mkdir dir="${build}" />
-	</target>
-
-	<target name="compile" depends="init" description="compile the source">
-		<javac srcdir="${src}" destdir="${build}" classpathref="dist.classpath" source="1.6" debug="on" includeantruntime="false" />
-	</target>
-
-	<target name="jar" depends="compile" description="create the jar">
-		<fileset dir="${lib}" id="lib.dist.fileset">
-			<include name="**/*.jar" />
-		</fileset>
-		<pathconvert pathsep=" " property="dist.classpath" refid="lib.dist.fileset">
-			<map from="${lib}" to=".\lib" />
-		</pathconvert>
-		<!-- Put everything in ${build} into a jar file -->
-		<jar jarfile="${ant.project.name}.jar">
-			<fileset dir="${build}" includes="**/*" />
-			<manifest>
-				<!-- SET YOUR MAIN CLASS HERE -->
-				<attribute name="Main-Class" value="net.sf.launch4j.example.SimpleApp" />
-				<attribute name="Class-Path" value=". ${dist.classpath}" />
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="exe" depends="jar">
-		<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask" classpath="${launch4j.dir}/launch4j.jar
-		    :${launch4j.dir}/lib/xstream.jar" />
-		<launch4j configFile="./l4j/SimpleApp.xml" />
-	</target>
-
-	<target name="clean" description="clean up">
-		<delete dir="${build}" />
-		<delete file="${ant.project.name}.jar" />
-		<delete file="${ant.project.name}.exe" />
-	</target>
-</project>
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/SimpleApp.ico b/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/SimpleApp.ico
deleted file mode 100644
index cc4c540..0000000
Binary files a/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/SimpleApp.ico and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/SimpleApp.xml b/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/SimpleApp.xml
deleted file mode 100644
index bb5804d..0000000
--- a/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/SimpleApp.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<launch4jConfig>
-  <headerType>gui</headerType>
-  <jar>../SimpleApp.jar</jar>
-  <outfile>../SimpleApp.exe</outfile>
-  <errTitle>SimpleApp</errTitle>
-  <chdir>.</chdir>
-  <icon>SimpleApp.ico</icon>
-  <restartOnCrash>true</restartOnCrash>
-  <jre>
-    <minVersion>1.6.0</minVersion>
-  </jre>
-  <splash>
-    <file>splash.bmp</file>
-    <waitForWindow>true</waitForWindow>
-    <timeout>60</timeout>
-    <timeoutErr>true</timeoutErr>
-  </splash>
-</launch4jConfig>
\ No newline at end of file
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/splash.bmp b/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/splash.bmp
deleted file mode 100644
index 88d7bbf..0000000
Binary files a/packaging_tools/windows/launch4j/demo/SimpleApp/l4j/splash.bmp and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/lib/readme.txt b/packaging_tools/windows/launch4j/demo/SimpleApp/lib/readme.txt
deleted file mode 100644
index a40a6b9..0000000
--- a/packaging_tools/windows/launch4j/demo/SimpleApp/lib/readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Put your jar libs here and the build script will include them
-in the classpath stored inside the jar manifest.
-In order to run your application move the output exe file from
-the dist directory to the same level as lib. 
-
-SimpleApp.exe
-lib/
-lib/xml.jar
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/readme.txt b/packaging_tools/windows/launch4j/demo/SimpleApp/readme.txt
deleted file mode 100644
index f971cd6..0000000
--- a/packaging_tools/windows/launch4j/demo/SimpleApp/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-To build the example application set JAVA_HOME and ANT_HOME environment variables.
diff --git a/packaging_tools/windows/launch4j/demo/SimpleApp/src/net/sf/launch4j/example/SimpleApp.java b/packaging_tools/windows/launch4j/demo/SimpleApp/src/net/sf/launch4j/example/SimpleApp.java
deleted file mode 100644
index 51d1109..0000000
--- a/packaging_tools/windows/launch4j/demo/SimpleApp/src/net/sf/launch4j/example/SimpleApp.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j.example;
-
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.AbstractAction;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-
-public class SimpleApp extends JFrame {
-    public SimpleApp(String[] args) {
-        super("Java Application");
-
-        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		setBounds (screenSize.width / 4, screenSize.height / 4, screenSize.width / 2, screenSize.height / 2);
-
-		JMenu menu = new JMenu("File");
-		menu.add(new JMenuItem("Open"));
-		menu.add(new JMenuItem("Save"));
-		
-		menu.addSeparator();
-		
-		menu.add(new JMenuItem(new AbstractAction("Exit with code 0") {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				System.exit(0);
-			}
-		}));
-		
-		menu.add(new JMenuItem(new AbstractAction("Exit with code 100 and restart the application") {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				System.exit(100);
-			}
-		}));
-		
-		JMenuBar mb = new JMenuBar();
-		mb.setOpaque(true);
-		mb.add(menu);
-		setJMenuBar(mb);
-
-		this.addWindowListener(new WindowAdapter() {
-	    	public void windowClosing(WindowEvent e) {
-				System.exit(0);
-		}});
-		setVisible(true);
-
-		StringBuffer sb = new StringBuffer("Java version: ");
-		sb.append(System.getProperty("java.version"));
-		sb.append("\nJava home: ");
-		sb.append(System.getProperty("java.home"));
-		sb.append("\nCurrent dir: ");
-		sb.append(System.getProperty("user.dir"));
-		if (args.length > 0) {
-			sb.append("\nArgs: ");
-			for (int i = 0; i < args.length; i++) {
-				sb.append(args[i]);
-				sb.append(' ');
-			}
-		}
-		JOptionPane.showMessageDialog(this,
-				sb.toString(),
-				"Info",
-				JOptionPane.INFORMATION_MESSAGE);
-    }
-
-	public static void setLAF() {
-		JFrame.setDefaultLookAndFeelDecorated(true);
-		Toolkit.getDefaultToolkit().setDynamicLayout(true);
-		System.setProperty("sun.awt.noerasebackground","true");
-		try {
-			UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
-		} catch (Exception e) {
-			System.err.println("Failed to set LookAndFeel");
-		}
-	}
-
-   	public static void main(String[] args) {
-   		setLAF();
-		new SimpleApp(args);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/demo/readme.txt b/packaging_tools/windows/launch4j/demo/readme.txt
deleted file mode 100644
index 3d98e80..0000000
--- a/packaging_tools/windows/launch4j/demo/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-JRE/SDK 1.6.0 or higher must be installed on your system to run this demo.
-
-try running it with some command line arguments...
diff --git a/packaging_tools/windows/launch4j/head/LICENSE.txt b/packaging_tools/windows/launch4j/head/LICENSE.txt
deleted file mode 100644
index e95c830..0000000
--- a/packaging_tools/windows/launch4j/head/LICENSE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (c) 2004, 2015 Grzegorz Kowal
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-Except as contained in this notice, the name(s) of the above copyright holders
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/packaging_tools/windows/launch4j/head_src/LICENSE.txt b/packaging_tools/windows/launch4j/head_src/LICENSE.txt
deleted file mode 100644
index a08f808..0000000
--- a/packaging_tools/windows/launch4j/head_src/LICENSE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (c) 2004, 2015 Grzegorz Kowal
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-Except as contained in this notice, the name(s) of the above copyright holders
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/packaging_tools/windows/launch4j/head_src/consolehead/.gitignore b/packaging_tools/windows/launch4j/head_src/consolehead/.gitignore
deleted file mode 100644
index b566d3b..0000000
--- a/packaging_tools/windows/launch4j/head_src/consolehead/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/consolehead.exe
-/consolehead.layout
diff --git a/packaging_tools/windows/launch4j/head_src/consolehead/Makefile.win b/packaging_tools/windows/launch4j/head_src/consolehead/Makefile.win
deleted file mode 100644
index 23cb75a..0000000
--- a/packaging_tools/windows/launch4j/head_src/consolehead/Makefile.win
+++ /dev/null
@@ -1,33 +0,0 @@
-# Project: consolehead
-# Makefile created by Dev-C++ 4.9.9.2
-
-CPP  = g++.exe
-CC   = gcc.exe
-WINDRES = windres.exe
-RES  = 
-OBJ  = ../../head/consolehead.o ../../head/head.o $(RES)
-LINKOBJ  = ../../head/consolehead.o ../../head/head.o $(RES)
-LIBS =  -L"C:/Dev-Cpp/lib" -n  -s 
-INCS =  -I"C:/Dev-Cpp/include" 
-CXXINCS =  -I"C:/Dev-Cpp/lib/gcc/mingw32/3.4.2/include"  -I"C:/Dev-Cpp/include/c++/3.4.2/backward"  -I"C:/Dev-Cpp/include/c++/3.4.2/mingw32"  -I"C:/Dev-Cpp/include/c++/3.4.2"  -I"C:/Dev-Cpp/include" 
-BIN  = consolehead.exe
-CXXFLAGS = $(CXXINCS)   -fexpensive-optimizations -O3
-CFLAGS = $(INCS)   -fexpensive-optimizations -O3
-RM = rm -f
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before consolehead.exe all-after
-
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN)
-
-$(BIN): $(OBJ)
-#	$(CC) $(LINKOBJ) -o "consolehead.exe" $(LIBS)
-
-../../head/consolehead.o: consolehead.c
-	$(CC) -c consolehead.c -o ../../head/consolehead.o $(CFLAGS)
-
-../../head/head.o: ../head.c
-	$(CC) -c ../head.c -o ../../head/head.o $(CFLAGS)
diff --git a/packaging_tools/windows/launch4j/head_src/consolehead/consolehead.c b/packaging_tools/windows/launch4j/head_src/consolehead/consolehead.c
deleted file mode 100644
index 1846a56..0000000
--- a/packaging_tools/windows/launch4j/head_src/consolehead/consolehead.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2007 Grzegorz Kowal
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	Except as contained in this notice, the name(s) of the above copyright holders
-	shall not be used in advertising or otherwise to promote the sale, use or other
-	dealings in this Software without prior written authorization.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-*/
-
-#include "../resource.h"
-#include "../head.h"
-
-extern FILE* hLog;
-
-BOOL restartOnCrash = FALSE;
-
-int main(int argc, char* argv[])
-{
-    setConsoleFlag();
-	LPTSTR cmdLine = GetCommandLine();
-
-	if (*cmdLine == '"')
-	{
-		if (*(cmdLine = strchr(cmdLine + 1, '"') + 1))
-		{
-			cmdLine++;
-		}
-	}
-	else if ((cmdLine = strchr(cmdLine, ' ')) != NULL)
-	{
-		cmdLine++;
-	}
-	else
-	{
-		cmdLine = "";
-	}
-
-	int result = prepare(cmdLine);
-
-	if (result == ERROR_ALREADY_EXISTS)
-	{
-		char errMsg[BIG_STR] = {0};
-		loadString(INSTANCE_ALREADY_EXISTS_MSG, errMsg);
-		msgBox(errMsg);
-		closeLogFile();
-		return 2;
-	}
-
-	if (result != TRUE)
-	{
-		signalError();
-		return 1;
-	}
-
-	restartOnCrash = loadBool(RESTART_ON_CRASH);
-	DWORD dwExitCode;
-
-	do
-	{
-		dwExitCode = 0;
-	
-		if (!execute(TRUE, &dwExitCode))
-		{
-			signalError();
-			break;
-		}
-
-		if (restartOnCrash && dwExitCode != 0)
-		{
-	  		debug("Exit code:\t%d, restarting the application!\n", dwExitCode);
-  		}
-	} while (restartOnCrash && dwExitCode != 0);
-
-	debug("Exit code:\t%d\n", dwExitCode);
-	closeLogFile();
-	return (int) dwExitCode;
-}
diff --git a/packaging_tools/windows/launch4j/head_src/consolehead/consolehead.dev b/packaging_tools/windows/launch4j/head_src/consolehead/consolehead.dev
deleted file mode 100644
index 94883ea..0000000
--- a/packaging_tools/windows/launch4j/head_src/consolehead/consolehead.dev
+++ /dev/null
@@ -1,108 +0,0 @@
-[Project]
-FileName=consolehead.dev
-Name=consolehead
-UnitCount=4
-Type=1
-Ver=1
-ObjFiles=
-Includes=
-Libs=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=-n_@@_
-IsCpp=0
-Icon=
-ExeOutput=
-ObjectOutput=..\..\head
-OverrideOutput=0
-OverrideOutputName=consolehead.exe
-HostApplication=
-Folders=
-CommandLine=
-UseCustomMakefile=1
-CustomMakefile=Makefile.win
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000001001000000100
-
-[Unit1]
-FileName=consolehead.c
-CompileCpp=0
-Folder=consolehead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit2]
-FileName=..\resource.h
-CompileCpp=0
-Folder=consolehead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=..\head.c
-CompileCpp=0
-Folder=consolehead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=..\head.h
-CompileCpp=0
-Folder=consolehead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=..\head.rc
-Folder=consolehead
-Compile=1
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=..\resid.h
-CompileCpp=0
-Folder=consolehead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/packaging_tools/windows/launch4j/head_src/guihead/.gitignore b/packaging_tools/windows/launch4j/head_src/guihead/.gitignore
deleted file mode 100644
index 5ddac15..0000000
--- a/packaging_tools/windows/launch4j/head_src/guihead/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/guihead.exe
-/guihead.layout
diff --git a/packaging_tools/windows/launch4j/head_src/guihead/Makefile.win b/packaging_tools/windows/launch4j/head_src/guihead/Makefile.win
deleted file mode 100644
index 0109be4..0000000
--- a/packaging_tools/windows/launch4j/head_src/guihead/Makefile.win
+++ /dev/null
@@ -1,33 +0,0 @@
-# Project: guihead
-# Makefile created by Dev-C++ 4.9.9.2
-
-CPP  = g++.exe
-CC   = gcc.exe
-WINDRES = windres.exe
-RES  = 
-OBJ  = ../../head/guihead.o ../../head/head.o $(RES)
-LINKOBJ  = ../../head/guihead.o ../../head/head.o $(RES)
-LIBS =  -L"C:/Dev-Cpp/lib" -mwindows -n  -s 
-INCS =  -I"C:/Dev-Cpp/include" 
-CXXINCS =  -I"C:/Dev-Cpp/lib/gcc/mingw32/3.4.2/include"  -I"C:/Dev-Cpp/include/c++/3.4.2/backward"  -I"C:/Dev-Cpp/include/c++/3.4.2/mingw32"  -I"C:/Dev-Cpp/include/c++/3.4.2"  -I"C:/Dev-Cpp/include" 
-BIN  = guihead.exe
-CXXFLAGS = $(CXXINCS)   -fexpensive-optimizations -O3
-CFLAGS = $(INCS)   -fexpensive-optimizations -O3
-RM = rm -f
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before guihead.exe all-after
-
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN)
-
-$(BIN): $(OBJ)
-#	$(CC) $(LINKOBJ) -o "guihead.exe" $(LIBS)
-
-../../head/guihead.o: guihead.c
-	$(CC) -c guihead.c -o ../../head/guihead.o $(CFLAGS)
-
-../../head/head.o: ../head.c
-	$(CC) -c ../head.c -o ../../head/head.o $(CFLAGS)
diff --git a/packaging_tools/windows/launch4j/head_src/guihead/guihead.c b/packaging_tools/windows/launch4j/head_src/guihead/guihead.c
deleted file mode 100644
index f0d9935..0000000
--- a/packaging_tools/windows/launch4j/head_src/guihead/guihead.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-							 Sylvain Mina (single instance patch)
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	Except as contained in this notice, the name(s) of the above copyright holders
-	shall not be used in advertising or otherwise to promote the sale, use or other
-	dealings in this Software without prior written authorization.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-*/
-
-#include "../resource.h"
-#include "../head.h"
-#include "guihead.h"
-
-extern FILE* hLog;
-extern PROCESS_INFORMATION processInformation;
-
-HWND hWnd;
-DWORD dwExitCode = 0;
-BOOL stayAlive = FALSE;
-BOOL splash = FALSE;
-BOOL splashTimeoutErr;
-BOOL waitForWindow;
-BOOL restartOnCrash = FALSE;
-int splashTimeout = DEFAULT_SPLASH_TIMEOUT;
-
-int APIENTRY WinMain(HINSTANCE hInstance,
-                     HINSTANCE hPrevInstance,
-                     LPSTR     lpCmdLine,
-                     int       nCmdShow)
-{
-	int result = prepare(lpCmdLine);
-
-	if (result == ERROR_ALREADY_EXISTS)
-	{
-		HWND handle = getInstanceWindow();
-		ShowWindow(handle, SW_SHOW);
-		SetForegroundWindow(handle);
-		closeLogFile();
-		return 2;
-	}
-
-	if (result != TRUE)
-	{
-		signalError();
-		return 1;
-	}
-
-	splash = loadBool(SHOW_SPLASH)
-			&& strstr(lpCmdLine, "--l4j-no-splash") == NULL;
-	restartOnCrash = loadBool(RESTART_ON_CRASH);
-
-	// if we should restart on crash, we must also stay alive to check for crashes
-	stayAlive = restartOnCrash ||
-			  (loadBool(GUI_HEADER_STAYS_ALIVE)
-			&& strstr(lpCmdLine, "--l4j-dont-wait") == NULL);
-			
-	if (splash || stayAlive)
-	{
-		hWnd = CreateWindowEx(WS_EX_TOOLWINDOW, "STATIC", "",
-				WS_POPUP | SS_BITMAP,
-				0, 0, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL);
-		if (splash)
-		{
-			char timeout[10] = {0};
-			if (loadString(SPLASH_TIMEOUT, timeout))
-			{
-				splashTimeout = atoi(timeout);
-				if (splashTimeout <= 0 || splashTimeout > MAX_SPLASH_TIMEOUT)
-				{
-					splashTimeout = DEFAULT_SPLASH_TIMEOUT;
-				}
-			}
-			splashTimeoutErr = loadBool(SPLASH_TIMEOUT_ERR)
-					&& strstr(lpCmdLine, "--l4j-no-splash-err") == NULL;
-			waitForWindow = loadBool(SPLASH_WAITS_FOR_WINDOW);
-			HANDLE hImage = LoadImage(hInstance,	// handle of the instance containing the image
-					MAKEINTRESOURCE(SPLASH_BITMAP),	// name or identifier of image
-					IMAGE_BITMAP,					// type of image
-					0,								// desired width
-					0,								// desired height
-					LR_DEFAULTSIZE);
-			if (hImage == NULL)
-			{
-				signalError();
-				return 1;
-			}
-			SendMessage(hWnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM) hImage);
-			RECT rect;
-			GetWindowRect(hWnd, &rect);
-			int x = (GetSystemMetrics(SM_CXSCREEN) - (rect.right - rect.left)) / 2;
-			int y = (GetSystemMetrics(SM_CYSCREEN) - (rect.bottom - rect.top)) / 2;
-			SetWindowPos(hWnd, HWND_TOP, x, y, 0, 0, SWP_NOSIZE);
-			ShowWindow(hWnd, nCmdShow);
-			UpdateWindow (hWnd);
-		}
-	}
-
-	do
-	{
-		if (splash || stayAlive)
-		{
-			if (!SetTimer (hWnd, ID_TIMER, 1000 /* 1s */, TimerProc))
-			{
-				signalError();
-				return 1;
-			}
-		}
-
-		if (!execute(FALSE, &dwExitCode))
-		{
-			signalError();
-			return 1;
-		}
-
-		if (!(splash || stayAlive))
-		{
-			debug("Exit code:\t0\n");
-			closeProcessHandles();
-			closeLogFile();
-			return 0;
-		}
-	
-		MSG msg;
-		while (GetMessage(&msg, NULL, 0, 0))
-		{
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-		
-		if (restartOnCrash && dwExitCode != 0)
-		{
-	  		debug("Exit code:\t%d, restarting the application!\n", dwExitCode);
-  		}
-
-  		closeProcessHandles();
-	} while (restartOnCrash && dwExitCode != 0);
-
-	debug("Exit code:\t%d\n", dwExitCode);
-	closeLogFile();
-	return dwExitCode;
-}
-
-HWND getInstanceWindow()
-{
-	char windowTitle[STR];
-	char instWindowTitle[STR] = {0};
-	if (loadString(INSTANCE_WINDOW_TITLE, instWindowTitle))
-	{
-		HWND handle = FindWindowEx(NULL, NULL, NULL, NULL); 
-		while (handle != NULL)
-		{
-			GetWindowText(handle, windowTitle, STR - 1);
-			if (strstr(windowTitle, instWindowTitle) != NULL)
-			{
-				return handle;
-			}
-			else
-			{
-				handle = FindWindowEx(NULL, handle, NULL, NULL);
-			}
-		}
-	}
-	return NULL;   
-}
-
-BOOL CALLBACK enumwndfn(HWND hwnd, LPARAM lParam)
-{
-	DWORD processId;
-	GetWindowThreadProcessId(hwnd, &processId);
-	if (processInformation.dwProcessId == processId)
-	{
-		LONG styles = GetWindowLong(hwnd, GWL_STYLE);
-		if ((styles & WS_VISIBLE) != 0)
-		{
-			splash = FALSE;
-			ShowWindow(hWnd, SW_HIDE);
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-VOID CALLBACK TimerProc(
-	HWND hwnd,			// handle of window for timer messages
-	UINT uMsg,			// WM_TIMER message
-	UINT idEvent,		// timer identifier
-	DWORD dwTime) 		// current system time
-{
-	if (splash)
-	{
-		if (splashTimeout == 0)
-		{
-			splash = FALSE;
-			ShowWindow(hWnd, SW_HIDE);
-			if (waitForWindow && splashTimeoutErr)
-			{
-				KillTimer(hwnd, ID_TIMER);
-				signalError();
-				PostQuitMessage(0);
-			}
-		}
-		else
-		{
-			splashTimeout--;
-			if (waitForWindow)
-			{
-				EnumWindows(enumwndfn, 0);
-			}
-		}
-	}
-
-	GetExitCodeProcess(processInformation.hProcess, &dwExitCode);
-	if (dwExitCode != STILL_ACTIVE
-			|| !(splash || stayAlive))
-	{
-		KillTimer(hWnd, ID_TIMER);
-		PostQuitMessage(0);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/head_src/guihead/guihead.dev b/packaging_tools/windows/launch4j/head_src/guihead/guihead.dev
deleted file mode 100644
index 3addd6f..0000000
--- a/packaging_tools/windows/launch4j/head_src/guihead/guihead.dev
+++ /dev/null
@@ -1,109 +0,0 @@
-[Project]
-FileName=guihead.dev
-Name=guihead
-UnitCount=5
-Type=0
-Ver=1
-ObjFiles=
-Includes=
-Libs=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=-n_@@_
-IsCpp=0
-Icon=
-ExeOutput=
-ObjectOutput=..\..\head
-OverrideOutput=0
-OverrideOutputName=guihead.exe
-HostApplication=
-Folders=
-CommandLine=
-UseCustomMakefile=1
-CustomMakefile=Makefile.win
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000001001000000100
-
-[Unit1]
-FileName=guihead.c
-CompileCpp=0
-Folder=guihead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c guihead.c -o ../../head/guihead.o $(CFLAGS)
-
-[Unit2]
-FileName=guihead.h
-CompileCpp=0
-Folder=guihead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit4]
-FileName=..\head.h
-CompileCpp=0
-Folder=guihead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=..\resid.h
-CompileCpp=0
-Folder=guihead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=..\head.c
-CompileCpp=0
-Folder=guihead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=..\resource.h
-CompileCpp=0
-Folder=guihead
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/packaging_tools/windows/launch4j/head_src/guihead/guihead.h b/packaging_tools/windows/launch4j/head_src/guihead/guihead.h
deleted file mode 100644
index ebef396..0000000
--- a/packaging_tools/windows/launch4j/head_src/guihead/guihead.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2007 Grzegorz Kowal
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	Except as contained in this notice, the name(s) of the above copyright holders
-	shall not be used in advertising or otherwise to promote the sale, use or other
-	dealings in this Software without prior written authorization.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-*/
-
-#define ID_TIMER 1
-#define DEFAULT_SPLASH_TIMEOUT	60			/* 60 seconds */
-#define MAX_SPLASH_TIMEOUT		60 * 15		/* 15 minutes */
-
-HWND getInstanceWindow();
-
-BOOL CALLBACK enumwndfn(HWND hwnd, LPARAM lParam);
-
-VOID CALLBACK TimerProc(
-  HWND hwnd,     // handle of window for timer messages
-  UINT uMsg,     // WM_TIMER message
-  UINT idEvent,  // timer identifier
-  DWORD dwTime   // current system time
-);
diff --git a/packaging_tools/windows/launch4j/head_src/head.c b/packaging_tools/windows/launch4j/head_src/head.c
deleted file mode 100644
index 04374ea..0000000
--- a/packaging_tools/windows/launch4j/head_src/head.c
+++ /dev/null
@@ -1,1167 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal,
-							 Ian Roberts (jdk preference patch)
-							 Sylvain Mina (single instance patch)
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	Except as contained in this notice, the name(s) of the above copyright holders
-	shall not be used in advertising or otherwise to promote the sale, use or other
-	dealings in this Software without prior written authorization.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-*/
-
-#include "resource.h"
-#include "head.h"
-
-HMODULE hModule;
-FILE* hLog;
-BOOL debugAll = FALSE;
-BOOL console = FALSE;
-BOOL wow64 = FALSE;
-char oldPwd[_MAX_PATH];
-
-PROCESS_INFORMATION processInformation;
-DWORD processPriority;
-
-struct
-{
-	char title[STR];
-	char msg[BIG_STR];
-	char url[256];
-} error;
-
-struct
-{
-	int runtimeBits;
-	int foundJava;
-	BOOL bundledJreAsFallback;
-	BOOL corruptedJreFound;
-	char javaMinVer[STR];
-	char javaMaxVer[STR];
-	char foundJavaVer[STR];
-	char foundJavaKey[_MAX_PATH];
-	char foundJavaHome[_MAX_PATH];
-} search;
-
-struct
-{
-	char cmd[_MAX_PATH];
-	char args[MAX_ARGS];
-} launcher;
-
-BOOL initGlobals()
-{
-	hModule = GetModuleHandle(NULL);
-
-	if (hModule == NULL)
-	{
-		return FALSE;
-	}
-
-	strcpy(error.title, LAUNCH4j);
-
-	search.runtimeBits = INIT_RUNTIME_BITS;
-	search.foundJava = NO_JAVA_FOUND;
-	search.bundledJreAsFallback = FALSE;
-	search.corruptedJreFound = FALSE;
-	
-	return TRUE;
-}
-
-FILE* openLogFile(const char* exePath, const int pathLen)
-{
-	char path[_MAX_PATH] = {0};
-	strncpy(path, exePath, pathLen);
-	strcat(path, "\\launch4j.log");
-	return fopen(path, "a");
-}
-
-void closeLogFile()
-{
-	if (hLog != NULL)
-	{
-		fclose(hLog);	
-	}
-}
-
-BOOL initializeLogging(const char *lpCmdLine, const char* exePath, const int pathLen)
-{
-	char varValue[MAX_VAR_SIZE] = {0};
-	GetEnvironmentVariable(LAUNCH4j, varValue, MAX_VAR_SIZE);
-
-    if (strstr(lpCmdLine, "--l4j-debug") != NULL
-			|| strstr(varValue, "debug") != NULL)
-	{
-		hLog = openLogFile(exePath, pathLen);
-
-		if (hLog == NULL)
-		{
-			return FALSE;
-		}
-
-		debugAll = strstr(lpCmdLine, "--l4j-debug-all") != NULL
-				|| strstr(varValue, "debug-all") != NULL;
-	}
-	
-	debug("\n\nVersion:\t%s\n", VERSION);
-	debug("CmdLine:\t%s %s\n", exePath, lpCmdLine);
-
-	return TRUE;
-}
-
-void setWow64Flag()
-{
-	LPFN_ISWOW64PROCESS fnIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress(
-			GetModuleHandle(TEXT("kernel32")), "IsWow64Process");
-
-	if (fnIsWow64Process != NULL)
-	{
-		fnIsWow64Process(GetCurrentProcess(), &wow64);
-	}
-
-	debug("WOW64:\t\t%s\n", wow64 ? "yes" : "no"); 
-}
-
-void setConsoleFlag()
-{
-     console = TRUE;
-}
-
-void msgBox(const char* text)
-{
-    if (console)
-	{
-        if (*error.title)
-        {
-            printf("%s: %s\n", error.title, text);
-        }
-        else
-        {
-            printf("%s\n", text);
-        }
-    }
-	else
-	{
-    	MessageBox(NULL, text, error.title, MB_OK);
-    }
-}
-
-void signalError()
-{
-	DWORD err = GetLastError();
-	debug("Error msg:\t%s\n", error.msg);
-
-	if (err)
-	{
-		LPVOID lpMsgBuf;
-		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
-						| FORMAT_MESSAGE_FROM_SYSTEM
-						| FORMAT_MESSAGE_IGNORE_INSERTS,
-				NULL,
-				err,
-				MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-			    (LPTSTR) &lpMsgBuf,
-			    0,
-			    NULL);
-		debug(ERROR_FORMAT, (LPCTSTR) lpMsgBuf);
-		strcat(error.msg, "\n\n");
-		strcat(error.msg, (LPCTSTR) lpMsgBuf);
-		LocalFree(lpMsgBuf);
-	}
-	
-	msgBox(error.msg);
-
-	if (*error.url)
-	{
-		debug("Open URL:\t%s\n", error.url);
-		ShellExecute(NULL, "open", error.url, NULL, NULL, SW_SHOWNORMAL);
-	}
-
-	closeLogFile();
-}
-
-BOOL loadString(const int resID, char* buffer)
-{
-	HRSRC hResource;
-	HGLOBAL hResourceLoaded;
-	LPBYTE lpBuffer;
-
-	hResource = FindResourceEx(hModule, RT_RCDATA, MAKEINTRESOURCE(resID),
-			MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT));
-	if (NULL != hResource)
-	{
-		hResourceLoaded = LoadResource(hModule, hResource);
-		if (NULL != hResourceLoaded)
-		{
-			lpBuffer = (LPBYTE) LockResource(hResourceLoaded);            
-			if (NULL != lpBuffer)
-			{     
-				int x = 0;
-				do
-				{
-					buffer[x] = (char) lpBuffer[x];
-				} while (buffer[x++] != 0);
-				
-				if (debugAll)
-				{
-					debug("Resource %d:\t%s\n", resID, buffer);
-				}
-				return TRUE;
-			}
-		}    
-	}
-	else
-	{
-		SetLastError(0);
-		buffer[0] = 0;
-	}
-	return FALSE;
-}
-
-BOOL loadBool(const int resID)
-{
-	char boolStr[20] = {0};
-	loadString(resID, boolStr);
-	return strcmp(boolStr, TRUE_STR) == 0;
-}
-
-int loadInt(const int resID)
-{
-	char intStr[20] = {0};
-	loadString(resID, intStr);
-	return atoi(intStr);
-}
-
-BOOL regQueryValue(const char* regPath, unsigned char* buffer,
-		unsigned long bufferLength)
-{
-	HKEY hRootKey;
-	char* key;
-	char* value;
-
-	if (strstr(regPath, HKEY_CLASSES_ROOT_STR) == regPath)
-	{
-		hRootKey = HKEY_CLASSES_ROOT;
-	}
-	else if (strstr(regPath, HKEY_CURRENT_USER_STR) == regPath)
-	{
-		hRootKey = HKEY_CURRENT_USER;
-	}
-	else if (strstr(regPath, HKEY_LOCAL_MACHINE_STR) == regPath)
-	{
-		hRootKey = HKEY_LOCAL_MACHINE;
-	}
-	else if (strstr(regPath, HKEY_USERS_STR) == regPath)
-	{
-		hRootKey = HKEY_USERS;
-	}
-	else if (strstr(regPath, HKEY_CURRENT_CONFIG_STR) == regPath)
-	{
-		hRootKey = HKEY_CURRENT_CONFIG;
-	}
-	else
-	{
-		return FALSE;
-	}
-
-	key = strchr(regPath, '\\') + 1;
-	value = strrchr(regPath, '\\') + 1;
-	*(value - 1) = 0;
-
-	HKEY hKey;
-	unsigned long datatype;
-	BOOL result = FALSE;
-	if ((wow64 && RegOpenKeyEx(hRootKey,
-								key,
-								0,
-	        					KEY_READ | KEY_WOW64_64KEY,
-								&hKey) == ERROR_SUCCESS)
-			|| RegOpenKeyEx(hRootKey,
-								key,
-								0,
-	        					KEY_READ,
-								&hKey) == ERROR_SUCCESS)
-	{
-		result = RegQueryValueEx(hKey, value, NULL, &datatype, buffer, &bufferLength)
-				== ERROR_SUCCESS;
-		RegCloseKey(hKey);
-	}
-	*(value - 1) = '\\';
-	return result;
-}
-
-void regSearch(const char* keyName, const int searchType)
-{
-	HKEY hKey;
-	const DWORD wow64KeyMask = searchType & KEY_WOW64_64KEY;
-
-	debug("%s-bit search:\t%s...\n", wow64KeyMask ? "64" : "32", keyName);
-
-	if (!RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-			keyName,
-			0,
-	        KEY_READ | wow64KeyMask,
-			&hKey) == ERROR_SUCCESS)
-	{
-		return;
-	}
-
-	DWORD x = 0;
-	unsigned long versionSize = _MAX_PATH;
-	FILETIME time;
-	char fullKeyName[_MAX_PATH] = {0};
-	char version[_MAX_PATH] = {0};
-
-	while (RegEnumKeyEx(
-				hKey,			// handle to key to enumerate
-				x++,			// index of subkey to enumerate
-				version,		// address of buffer for subkey name
-				&versionSize,	// address for size of subkey buffer
-				NULL,			// reserved
-				NULL,			// address of buffer for class string
-				NULL,			// address for size of class buffer
-				&time) == ERROR_SUCCESS)
-	{
-		strcpy(fullKeyName, keyName);
-		appendPath(fullKeyName, version);
-		debug("Check:\t\t%s\n", fullKeyName);
-
-		if (strcmp(version, search.javaMinVer) >= 0
-				&& (!*search.javaMaxVer || strcmp(version, search.javaMaxVer) <= 0)
-				&& strcmp(version, search.foundJavaVer) > 0
-				&& isJavaHomeValid(fullKeyName, searchType))
-		{
-			strcpy(search.foundJavaVer, version);
-			strcpy(search.foundJavaKey, fullKeyName);
-			search.foundJava = searchType;
-			debug("Match:\t\t%s\n", version);
-		}
-		else
-		{
-			debug("Ignore:\t\t%s\n", version);
-		}
-
-		versionSize = _MAX_PATH;
-	}
-
-	RegCloseKey(hKey);
-}
-
-BOOL isJavaHomeValid(const char* keyName, const int searchType)
-{
-	BOOL valid = FALSE;
-	HKEY hKey;
-	char path[_MAX_PATH] = {0};
-
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-			keyName,
-			0,
-            KEY_READ | (searchType & KEY_WOW64_64KEY),
-			&hKey) == ERROR_SUCCESS)
-	{
-		unsigned char buffer[_MAX_PATH] = {0};
-		unsigned long bufferlength = _MAX_PATH;
-		unsigned long datatype;
-
-		if (RegQueryValueEx(hKey, "JavaHome", NULL, &datatype, buffer,
-				&bufferlength) == ERROR_SUCCESS)
-		{
-			int i = 0;
-			do
-			{
-				path[i] = buffer[i];
-			} while (path[i++] != 0);
-			
-			if (searchType & FOUND_SDK)
-			{
-				appendPath(path, "jre");
-			}
-			valid = isLauncherPathValid(path);
-		}
-		RegCloseKey(hKey);
-	}
-
-	if (valid)
-	{
-		strcpy(search.foundJavaHome, path);
-	}
-	else
-	{
-		search.corruptedJreFound = TRUE;
-	}
-
-	return valid;
-}
-
-BOOL isLauncherPathValid(const char* path)
-{
-	struct _stat statBuf;
-	char launcherPath[_MAX_PATH] = {0};
-	BOOL result = FALSE;
-
-	if (*path)
-	{
-		strcpy(launcherPath, path);
-		appendLauncher(launcherPath);
-		result = _stat(launcherPath, &statBuf) == 0;
-
-		if (!result)
-		{
-			// Don't display additional info in the error popup.
-			SetLastError(0);
-		}
-	}
-
-	debug("Check launcher:\t%s %s\n", launcherPath, result ? "(OK)" : "(not found)");
-	return result;
-}
-
-void regSearchWow(const char* keyName, const int searchType)
-{
-	if (search.runtimeBits == INIT_RUNTIME_BITS)
-	{
-		search.runtimeBits = loadInt(RUNTIME_BITS);
-	}
-
-	switch (search.runtimeBits)
-	{
-		case USE_64_BIT_RUNTIME:
-			if (wow64)
-			{
-				regSearch(keyName, searchType | KEY_WOW64_64KEY);
-			}
-			break;
-
-		case USE_64_AND_32_BIT_RUNTIME:
-			if (wow64)
-			{
-				regSearch(keyName, searchType | KEY_WOW64_64KEY);
-				
-				if ((search.foundJava & KEY_WOW64_64KEY) != NO_JAVA_FOUND)
-				{
-					break;
-				}
-			}
-
-			regSearch(keyName, searchType);
-			break;
-
-		case USE_32_AND_64_BIT_RUNTIME:
-			regSearch(keyName, searchType);
-
-			if (search.foundJava != NO_JAVA_FOUND
-				&& (search.foundJava & KEY_WOW64_64KEY) == NO_JAVA_FOUND)
-			{
-				break;
-			}
-
-			if (wow64)
-			{
-				regSearch(keyName, searchType | KEY_WOW64_64KEY);
-			}
-			break;
-
-		case USE_32_BIT_RUNTIME:
-			regSearch(keyName, searchType);
-			break;
-	}
-}
-
-void regSearchJreSdk(const char* jreKeyName, const char* sdkKeyName,
-		const int jdkPreference)
-{
-	if (jdkPreference == JDK_ONLY || jdkPreference == PREFER_JDK)
-	{
-		regSearchWow(sdkKeyName, FOUND_SDK);
-		if (jdkPreference != JDK_ONLY)
-		{
-			regSearchWow(jreKeyName, FOUND_JRE);
-		}
-	}
-	else
-	{
-		// jdkPreference == JRE_ONLY or PREFER_JRE
-		regSearchWow(jreKeyName, FOUND_JRE);
-		if (jdkPreference != JRE_ONLY)
-		{
-			regSearchWow(sdkKeyName, FOUND_SDK);
-		}
-	}
-}
-
-BOOL findJavaHome(char* path, const int jdkPreference)
-{
-	regSearchJreSdk("SOFTWARE\\JavaSoft\\Java Runtime Environment",
-					"SOFTWARE\\JavaSoft\\Java Development Kit",
-					jdkPreference);
-
-	if (search.foundJava == NO_JAVA_FOUND)
-	{
-		regSearchJreSdk("SOFTWARE\\IBM\\Java2 Runtime Environment",
-						"SOFTWARE\\IBM\\Java Development Kit",
-						jdkPreference);
-	}
-	
-	if (search.foundJava != NO_JAVA_FOUND)
-	{
-		strcpy(path, search.foundJavaHome);
-		debug("Runtime used:\t%s (%s-bit)\n", search.foundJavaVer,
-				(search.foundJava & KEY_WOW64_64KEY) != NO_JAVA_FOUND ? "64" : "32");
-		return TRUE;	
-	}
-	
-	return FALSE;
-}
-
-/*
- * Extract the executable name, returns path length.
- */
-int getExePath(char* exePath)
-{
-    if (GetModuleFileName(hModule, exePath, _MAX_PATH) == 0)
-	{
-        return -1;
-    }
-	return strrchr(exePath, '\\') - exePath;
-}
-
-void appendPath(char* basepath, const char* path)
-{
-	if (basepath[strlen(basepath) - 1] != '\\')
-	{
-		strcat(basepath, "\\");
-	}
-	strcat(basepath, path);
-}
-
-void appendLauncher(char* jrePath)
-{
-    if (console)
-	{
-	    appendPath(jrePath, "bin\\java.exe");
-    }
-	else
-	{
-        appendPath(jrePath, "bin\\javaw.exe");
-    }
-}
-
-void appendAppClasspath(char* dst, const char* src)
-{
-	strcat(dst, src);
-	strcat(dst, ";");
-}
-
-/* 
- * Expand environment %variables%
- */
-BOOL expandVars(char *dst, const char *src, const char *exePath, const int pathLen)
-{
-    char varName[STR] = {0};
-    char varValue[MAX_VAR_SIZE] = {0};
-
-    while (strlen(src) > 0)
-	{
-        char *start = strchr(src, '%');
-        if (start != NULL)
-		{
-            char *end = strchr(start + 1, '%');
-            if (end == NULL)
-			{
-                return FALSE;
-            }
-            // Copy content up to %VAR%
-            strncat(dst, src, start - src);
-            // Insert value of %VAR%
-            *varName = 0;
-            strncat(varName, start + 1, end - start - 1);
-            // Remember value start for logging
-            char *currentVarValue = dst + strlen(dst);
-            
-			if (strcmp(varName, "EXEDIR") == 0)
-			{
-                strncat(dst, exePath, pathLen);
-            }
-			else if (strcmp(varName, "EXEFILE") == 0)
-			{
-                strcat(dst, exePath);
-            }
-			else if (strcmp(varName, "PWD") == 0)
-			{
-                GetCurrentDirectory(_MAX_PATH, dst + strlen(dst));
-            }
-			else if (strcmp(varName, "OLDPWD") == 0)
-			{
-                strcat(dst, oldPwd);
-			}
-            else if (strcmp(varName, "JREHOMEDIR") == 0)
-			{
-                strcat(dst, search.foundJavaHome);
-			}
-			else if (strstr(varName, HKEY_STR) == varName)
-			{
-				regQueryValue(varName, dst + strlen(dst), BIG_STR);
-            }
-			else if (GetEnvironmentVariable(varName, varValue, MAX_VAR_SIZE) > 0)
-			{
-                strcat(dst, varValue);
-            }
-
-            debug("Substitute:\t%s = %s\n", varName, currentVarValue);
-            src = end + 1;
-        }
-		else
-		{
-            // Copy remaining content
-            strcat(dst, src);
-            break;
-        }
-	}
-	return TRUE;
-}
-
-void appendHeapSizes(char *dst)
-{
-	MEMORYSTATUSEX statex;
-	statex.dwLength = sizeof(statex);
-	GlobalMemoryStatusEx(&statex);
-
-	appendHeapSize(dst, INITIAL_HEAP_SIZE, INITIAL_HEAP_PERCENT,
-			statex.ullAvailPhys, "-Xms");
-	appendHeapSize(dst, MAX_HEAP_SIZE, MAX_HEAP_PERCENT,
-			statex.ullAvailPhys, "-Xmx");
-}
-
-void appendHeapSize(char *dst, const int megabytesID, const int percentID,
-		const DWORDLONG availableMemory, const char *option)
-{
-	const int mb = 1048576;			// 1 MB
-	const int mbLimit32 = 1024;  	// Max heap size in MB on 32-bit JREs
-	const int megabytes = loadInt(megabytesID);
-	const int percent = loadInt(percentID);
-	const int availableMb = availableMemory * percent / (100 * mb);	// 100% * 1 MB
-    int heapSizeMb = availableMb > megabytes ? availableMb : megabytes;
-
-	if (heapSizeMb > 0)
-	{
-		if (!(search.foundJava & KEY_WOW64_64KEY) && heapSizeMb > mbLimit32)
-		{
-			debug("Heap limit:\tReduced %d MB heap size to 32-bit maximum %d MB\n",
-					heapSizeMb, mbLimit32);
-			heapSizeMb = mbLimit32;
-		}
-
-		debug("Heap %s:\tRequested %d MB / %d%%, Available: %d MB, Heap size: %d MB\n",
-				option, megabytes, percent, (int)(availableMemory / mb), heapSizeMb);
-		strcat(dst, option);
-		_itoa(heapSizeMb, dst + strlen(dst), 10);				// 10 -- radix
-		strcat(dst, "m ");
-	}
-}
-
-void setJvmOptions(char *jvmOptions, const char *exePath)
-{
-	if (loadString(JVM_OPTIONS, jvmOptions))
-	{
-		strcat(jvmOptions, " ");
-	}
-
-	/*
-	 * Load additional JVM options from .l4j.ini file
-	 * Options are separated by spaces or CRLF
-	 * # starts an inline comment
-	 */
-	char iniFilePath[_MAX_PATH] = {0};
-	strncpy(iniFilePath, exePath, strlen(exePath) - 3);
-	strcat(iniFilePath, "l4j.ini");
-	long hFile;
-
-	if ((hFile = _open(iniFilePath, _O_RDONLY)) != -1)
-	{
-		debug("Loading:\t%s\n", iniFilePath);
-		const int jvmOptLen = strlen(jvmOptions);
-		char* src = jvmOptions + jvmOptLen;
-		char* dst = src;
-		const int len = _read(hFile, src, MAX_ARGS - jvmOptLen - BIG_STR);
-		BOOL copy = TRUE;
-		int i;
-		for (i = 0; i < len; i++, src++)
-		{
-			if (*src == '#')
-			{
-				copy = FALSE;
-			}
-			else if (*src == 13 || *src == 10)
-			{
-				copy = TRUE;
-				if (dst > jvmOptions && *(dst - 1) != ' ')
-				{
-					*dst++ = ' ';
-				}
-			}
-			else if (copy)
-			{
-				*dst++ = *src;
-			}
-		}
-		*dst = 0;
-		if (len > 0 && *(dst - 1) != ' ')
-		{
-			strcat(jvmOptions, " ");
-		}
-		_close(hFile);
-	}	
-}
-
-BOOL createMutex()
-{
-	char mutexName[STR] = {0};
-
-	loadString(MUTEX_NAME, mutexName);
-
-	if (*mutexName)
-	{
-		SECURITY_ATTRIBUTES security;
-		security.nLength = sizeof(SECURITY_ATTRIBUTES);
-		security.bInheritHandle = TRUE;
-		security.lpSecurityDescriptor = NULL;
-		CreateMutexA(&security, FALSE, mutexName);
-
-		if (GetLastError() == ERROR_ALREADY_EXISTS)
-		{
-			debug(ERROR_FORMAT, "Instance already exists.");
-			return FALSE;
-		}
-	}
-	
-	return TRUE;
-}
-
-void setWorkingDirectory(const char *exePath, const int pathLen)
-{
-	char workingDir[_MAX_PATH] = {0};
-	char tmpPath[_MAX_PATH] = {0};
-
-	GetCurrentDirectory(_MAX_PATH, oldPwd);
-
-	if (loadString(CHDIR, tmpPath))
-	{
-		strncpy(workingDir, exePath, pathLen);
-		appendPath(workingDir, tmpPath);
-		_chdir(workingDir);
-		debug("Working dir:\t%s\n", workingDir);
-	}
-}
-
-BOOL bundledJreSearch(const char *exePath, const int pathLen)
-{
-	char tmpPath[_MAX_PATH] = {0};
-
-	if (loadString(JRE_PATH, tmpPath))
-	{
-		char jrePath[MAX_ARGS] = {0};
-		expandVars(jrePath, tmpPath, exePath, pathLen);
-		debug("Bundled JRE:\t%s\n", jrePath);
-
-		if (jrePath[0] == '\\' || jrePath[1] == ':')
-		{
-			// Absolute
-			strcpy(launcher.cmd, jrePath);
-		}
-		else
-		{
-			// Relative
-			strncpy(launcher.cmd, exePath, pathLen);
-			appendPath(launcher.cmd, jrePath);
-		}
-
-		if (isLauncherPathValid(launcher.cmd))
-		{
-			search.foundJava = (wow64 && loadBool(BUNDLED_JRE_64_BIT))
-				? FOUND_BUNDLED | KEY_WOW64_64KEY
-				: FOUND_BUNDLED;
-			strcpy(search.foundJavaHome, launcher.cmd);
-			return TRUE;
-		}
-    }
-
-    return FALSE;
-}
-
-BOOL installedJreSearch()
-{
-	return *search.javaMinVer && findJavaHome(launcher.cmd, loadInt(JDK_PREFERENCE));
-}
-
-void createJreSearchError()
-{
-	if (*search.javaMinVer)
-	{
-		loadString(JRE_VERSION_ERR, error.msg);
-		strcat(error.msg, " ");
-		strcat(error.msg, search.javaMinVer);
-	
-		if (*search.javaMaxVer)
-		{
-			strcat(error.msg, " - ");
-			strcat(error.msg, search.javaMaxVer);
-		}
-	
-		if (search.runtimeBits == USE_64_BIT_RUNTIME
-				|| search.runtimeBits == USE_32_BIT_RUNTIME)
-		{
-			strcat(error.msg, " (");
-			strcat(error.msg, search.runtimeBits == USE_64_BIT_RUNTIME ? "64" : "32");
-			strcat(error.msg, "-bit)");
-		}			
-		
-		if (search.corruptedJreFound)
-		{
-			char launcherErrMsg[BIG_STR] = {0};
-	
-			if (loadString(LAUNCHER_ERR, launcherErrMsg))
-			{
-				strcat(error.msg, "\n");
-				strcat(error.msg, launcherErrMsg);
-			}
-		}
-	
-		loadString(DOWNLOAD_URL, error.url);
-	}
-	else
-	{
-		loadString(BUNDLED_JRE_ERR, error.msg);
-	}
-}
-
-BOOL jreSearch(const char *exePath, const int pathLen)
-{
-	BOOL result = TRUE;
-
-	search.bundledJreAsFallback = loadBool(BUNDLED_JRE_AS_FALLBACK);
-	loadString(JAVA_MIN_VER, search.javaMinVer);
-	loadString(JAVA_MAX_VER, search.javaMaxVer);
-
-	if (search.bundledJreAsFallback)
-	{
-		if (!installedJreSearch())
-		{
-			result = bundledJreSearch(exePath, pathLen);
-		}
-	}
-	else
-	{
-		if (!bundledJreSearch(exePath, pathLen))
-		{
-			result = installedJreSearch();
-		}
-	}
-	
-	if (!result)
-	{
-		createJreSearchError();
-	}
-
-	return result;
-}
-
-/*
- * Append a path to the Path environment variable
- */
-BOOL appendToPathVar(const char* path)
-{
-	char chBuf[MAX_VAR_SIZE] = {0};
-	const int pathSize = GetEnvironmentVariable("Path", chBuf, MAX_VAR_SIZE);
-
-	if (MAX_VAR_SIZE - pathSize - 1 < strlen(path))
-	{
-		return FALSE;
-	}
-
-	strcat(chBuf, ";");
-	strcat(chBuf, path);
-	return SetEnvironmentVariable("Path", chBuf);
-}
-
-BOOL appendJreBinToPathVar()
-{
-	// Append a path to the Path environment variable
-	char jreBinPath[_MAX_PATH] = {0};
-	strcpy(jreBinPath, launcher.cmd);
-	strcat(jreBinPath, "\\bin");
-
-	if (!appendToPathVar(jreBinPath))
-	{
-		debug(ERROR_FORMAT, "appendToPathVar failed.");
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-void setEnvironmentVariables(const char *exePath, const int pathLen)
-{
-	char tmp[MAX_ARGS] = {0};
-	char envVars[MAX_VAR_SIZE] = {0};
-	loadString(ENV_VARIABLES, envVars);
-	char *var = strtok(envVars, "\t");
-
-	while (var != NULL)
-	{
-		char *varValue = strchr(var, '=');
-		*varValue++ = 0;
-		*tmp = 0;
-		expandVars(tmp, varValue, exePath, pathLen);
-		debug("Set var:\t%s = %s\n", var, tmp);
-		SetEnvironmentVariable(var, tmp);
-		var = strtok(NULL, "\t"); 
-	}
-}
-
-void setMainClassAndClassPath(const char *exePath, const int pathLen)
-{
-	char classPath[MAX_ARGS] = {0};
-	char expandedClassPath[MAX_ARGS] = {0};
-	char mainClass[STR] = {0};
-	char jar[_MAX_PATH] = {0};
-	char fullFileName[_MAX_PATH] = {0};
-	const BOOL wrapper = loadBool(WRAPPER);
-	loadString(JAR, jar);
-
-	if (loadString(MAIN_CLASS, mainClass))
-	{
-		if (!loadString(CLASSPATH, classPath))
-		{
-			debug("Info:\t\tClasspath not defined.\n");
-		}
-		
-		expandVars(expandedClassPath, classPath, exePath, pathLen);
-		strcat(launcher.args, "-classpath \"");
-
-		if (wrapper)
-		{
-			appendAppClasspath(launcher.args, exePath);
-		}
-		else if (*jar)
-		{
-			appendAppClasspath(launcher.args, jar);
-		}
-
-		// Deal with wildcards or >> strcat(launcherArgs, exp); <<
-		char* cp = strtok(expandedClassPath, ";");
-
-		while(cp != NULL)
-		{
-			debug("Add classpath:\t%s\n", cp);
-			if (strpbrk(cp, "*?") != NULL)
-			{
-				char* lastBackslash = strrchr(cp, '\\');
-				int pathLen = lastBackslash != NULL ? lastBackslash - cp + 1 : 0;
-				*fullFileName = 0;
-				strncpy(fullFileName, cp, pathLen);
-				char* fileName = fullFileName + pathLen;
-				*fileName = 0;
-				struct _finddata_t c_file;
-				long hFile;
-
-				if ((hFile = _findfirst(cp, &c_file)) != -1L)
-				{
-					do
-					{
-						strcpy(fileName, c_file.name);
-						appendAppClasspath(launcher.args, fullFileName);
-						debug("      \"      :\t%s\n", fullFileName);
-					} while (_findnext(hFile, &c_file) == 0);
-				}
-
-				_findclose(hFile);
-			}
-			else
-			{
-				appendAppClasspath(launcher.args, cp);
-			}
-			cp = strtok(NULL, ";");
-		}
-
-		*(launcher.args + strlen(launcher.args) - 1) = 0;
-		strcat(launcher.args, "\" ");
-		strcat(launcher.args, mainClass);
-	}
-	else if (wrapper)
-	{
-       	strcat(launcher.args, "-jar \"");
-		strcat(launcher.args, exePath);
-   		strcat(launcher.args, "\"");
-    }
-	else
-	{
-       	strcat(launcher.args, "-jar \"");
-        strncat(launcher.args, exePath, pathLen);
-        appendPath(launcher.args, jar);
-       	strcat(launcher.args, "\"");
-    }
-}
-
-void setCommandLineArgs(const char *lpCmdLine)
-{
-	char tmp[MAX_ARGS] = {0};
-
-	// Constant command line arguments
-	if (loadString(CMD_LINE, tmp))
-	{
-		strcat(launcher.args, " ");
-		strcat(launcher.args, tmp);
-	}
-
-	// Command line arguments
-	if (*lpCmdLine)
-	{
-		strcpy(tmp, lpCmdLine);
-		char* dst;
-		while ((dst = strstr(tmp, "--l4j-")) != NULL)
-		{
-			char* src = strchr(dst, ' ');
-			if (src == NULL || *(src + 1) == 0)
-			{
-				*dst = 0;
-			}
-			else
-			{
-				strcpy(dst, src + 1);
-			}
-		}
-		if (*tmp)
-		{
-			strcat(launcher.args, " ");
-			strcat(launcher.args, tmp);
-		}
-	}
-}
-
-int prepare(const char *lpCmdLine)
-{
-	if (!initGlobals())
-	{
-		return FALSE;
-	}
-
-	// Get executable path
-	char exePath[_MAX_PATH] = {0};
-	int pathLen = getExePath(exePath);
-
-	if (pathLen == -1)
-	{
-		return FALSE;
-	}
-
-	if (!initializeLogging(lpCmdLine, exePath, pathLen))
-	{
-		return FALSE;
-	}
-
-    setWow64Flag();
-
-	// Set default error message, title and optional support web site url.
-	loadString(ERR_TITLE, error.title);
-	loadString(SUPPORT_URL, error.url);
-
-	if (!loadString(STARTUP_ERR, error.msg))
-	{
-		debug(ERROR_FORMAT, "Startup error message not defined.");
-		return FALSE;			
-	}
-
-	// Single instance
-	if (!createMutex())
-	{
-		return ERROR_ALREADY_EXISTS;
-	}
-
-	setWorkingDirectory(exePath, pathLen);
-    
-	if (!jreSearch(exePath, pathLen))
-    {
-		return FALSE;
-	}
-
-	if (!appendJreBinToPathVar())
-	{
-		return FALSE;
-	}
-
-	setEnvironmentVariables(exePath, pathLen);
-	processPriority = loadInt(PRIORITY_CLASS);
-	appendLauncher(launcher.cmd);
-	appendHeapSizes(launcher.args);
-
-	char jvmOptions[MAX_ARGS] = {0};
-	setJvmOptions(jvmOptions, exePath);
-	expandVars(launcher.args, jvmOptions, exePath, pathLen);
-	setMainClassAndClassPath(exePath, pathLen);
-	setCommandLineArgs(lpCmdLine);
-
-	debug("Launcher:\t%s\n", launcher.cmd);
-	debug("Launcher args:\t%s\n", launcher.args);
-	debug("Args length:\t%d/32768 chars\n", strlen(launcher.args));
-	return TRUE;
-}
-
-void closeProcessHandles()
-{
-	CloseHandle(processInformation.hThread);
-	CloseHandle(processInformation.hProcess);
-}
-
-BOOL execute(const BOOL wait, DWORD *dwExitCode)
-{
-	STARTUPINFO si;
-
-    memset(&processInformation, 0, sizeof(processInformation));
-    memset(&si, 0, sizeof(si));
-    si.cb = sizeof(si);
-
-	char cmdline[MAX_ARGS] = {0};
-    strcpy(cmdline, "\"");
-	strcat(cmdline, launcher.cmd);
-	strcat(cmdline, "\" ");
-	strcat(cmdline, launcher.args);
-
-	if (CreateProcess(NULL, cmdline, NULL, NULL,
-			TRUE, processPriority, NULL, NULL, &si, &processInformation))
-	{
-		if (wait)
-		{
-			WaitForSingleObject(processInformation.hProcess, INFINITE);
-			GetExitCodeProcess(processInformation.hProcess, dwExitCode);
-			closeProcessHandles();
-		}
-		else
-		{
-			*dwExitCode = 0;
-		}
-		
-		return TRUE;
-	}
-
-	*dwExitCode = -1;
-	return FALSE;
-}
diff --git a/packaging_tools/windows/launch4j/head_src/head.h b/packaging_tools/windows/launch4j/head_src/head.h
deleted file mode 100644
index 1e70648..0000000
--- a/packaging_tools/windows/launch4j/head_src/head.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal,
-							 Ian Roberts (jdk preference patch)
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	Except as contained in this notice, the name(s) of the above copyright holders
-	shall not be used in advertising or otherwise to promote the sale, use or other
-	dealings in this Software without prior written authorization.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-*/
-
-#ifndef _LAUNCH4J_HEAD__INCLUDED_
-#define _LAUNCH4J_HEAD__INCLUDED_
-
-#define _WIN32_WINNT 0x0501
-#define WIN32_LEAN_AND_MEAN		// VC - Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <windows.h>
-
-// C RunTime Header Files
-#include <stdlib.h>
-#include <malloc.h>
-#include <memory.h>
-#include <tchar.h>
-#include <shellapi.h>
-#include <direct.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <io.h>
-#include <process.h>
-
-#define LAUNCH4j "Launch4j"
-#define VERSION "3.8"
-
-#define NO_JAVA_FOUND 0
-#define FOUND_JRE 1
-#define FOUND_SDK 2
-#define FOUND_BUNDLED 4
-
-#define JRE_ONLY 0
-#define PREFER_JRE 1
-#define PREFER_JDK 2
-#define JDK_ONLY 3
-
-#define USE_64_BIT_RUNTIME 1
-#define USE_64_AND_32_BIT_RUNTIME 2
-#define USE_32_AND_64_BIT_RUNTIME 3
-#define USE_32_BIT_RUNTIME 4
-#define INIT_RUNTIME_BITS 9
-
-#define KEY_WOW64_64KEY 0x0100
-
-#define HKEY_STR "HKEY"
-#define HKEY_CLASSES_ROOT_STR "HKEY_CLASSES_ROOT"
-#define HKEY_CURRENT_USER_STR "HKEY_CURRENT_USER"
-#define HKEY_LOCAL_MACHINE_STR "HKEY_LOCAL_MACHINE"
-#define HKEY_USERS_STR "HKEY_USERS"
-#define HKEY_CURRENT_CONFIG_STR "HKEY_CURRENT_CONFIG"
-
-#define STR 128
-#define BIG_STR 1024
-#define MAX_VAR_SIZE 32767
-#define MAX_ARGS 32768
-
-#define TRUE_STR "true"
-#define FALSE_STR "false"
-
-#define ERROR_FORMAT "Error:\t\t%s\n"
-#define debug(args...) if (hLog != NULL) fprintf(hLog, ## args);
-
-typedef void (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
-
-BOOL initGlobals();
-FILE* openLogFile(const char* exePath, const int pathLen);
-void closeLogFile();
-BOOL initializeLogging(const char *lpCmdLine, const char* exePath, const int pathLen);
-void msgBox(const char* text);
-void signalError();
-BOOL loadString(const int resID, char* buffer);
-BOOL loadBool(const int resID);
-int loadInt(const int resID);
-BOOL regQueryValue(const char* regPath, unsigned char* buffer,
-		unsigned long bufferLength);
-void regSearch(const char* keyName, const int searchType);
-BOOL isJavaHomeValid(const char* keyName, const int searchType);
-BOOL isLauncherPathValid(const char* path);
-void regSearchWow(const char* keyName, const int searchType);
-void regSearchJreSdk(const char* jreKeyName, const char* sdkKeyName,
-		const int jdkPreference);
-BOOL findJavaHome(char* path, const int jdkPreference);
-int getExePath(char* exePath);
-void appendPath(char* basepath, const char* path);
-void appendLauncher(char* jrePath);
-void appendAppClasspath(char* dst, const char* src);
-BOOL expandVars(char *dst, const char *src, const char *exePath, const int pathLen);
-void appendHeapSizes(char *dst);
-void appendHeapSize(char *dst, const int megabytesID, const int percentID,
-		const DWORDLONG availableMemory, const char *option);
-void setJvmOptions(char *jvmOptions, const char *exePath);
-BOOL createMutex();
-void setWorkingDirectory(const char *exePath, const int pathLen);
-BOOL bundledJreSearch(const char *exePath, const int pathLen);
-BOOL installedJreSearch();
-void createJreSearchError();
-BOOL jreSearch(const char *exePath, const int pathLen);
-BOOL appendToPathVar(const char* path);
-BOOL appendJreBinToPathVar();
-void setEnvironmentVariables(const char *exePath, const int pathLen);
-void setMainClassAndClassPath(const char *exePath, const int pathLen);
-void setCommandLineArgs(const char *lpCmdLine);
-int prepare(const char *lpCmdLine);
-void closeProcessHandles();
-BOOL execute(const BOOL wait, DWORD *dwExitCode);
-
-#endif // _LAUNCH4J_HEAD__INCLUDED_
diff --git a/packaging_tools/windows/launch4j/head_src/resource.h b/packaging_tools/windows/launch4j/head_src/resource.h
deleted file mode 100644
index 829923d..0000000
--- a/packaging_tools/windows/launch4j/head_src/resource.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2014 Grzegorz Kowal
-							 Ian Roberts (jdk preference patch)
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	Except as contained in this notice, the name(s) of the above copyright holders
-	shall not be used in advertising or otherwise to promote the sale, use or other
-	dealings in this Software without prior written authorization.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-*/
-
-// ICON
-#define APP_ICON 					1
-
-// BITMAP
-#define SPLASH_BITMAP				1
-
-// RCDATA
-#define JRE_PATH					1
-#define JAVA_MIN_VER				2
-#define JAVA_MAX_VER				3
-#define SHOW_SPLASH					4
-#define SPLASH_WAITS_FOR_WINDOW		5
-#define SPLASH_TIMEOUT				6 
-#define SPLASH_TIMEOUT_ERR			7
-#define CHDIR						8
-#define SET_PROC_NAME				9
-#define ERR_TITLE					10
-#define GUI_HEADER_STAYS_ALIVE		11
-#define JVM_OPTIONS					12
-#define CMD_LINE					13
-#define JAR							14
-#define MAIN_CLASS					15
-#define CLASSPATH					16
-#define WRAPPER						17
-#define JDK_PREFERENCE				18
-#define ENV_VARIABLES				19
-#define PRIORITY_CLASS				20
-#define DOWNLOAD_URL				21
-#define SUPPORT_URL					22
-#define MUTEX_NAME					23
-#define INSTANCE_WINDOW_TITLE		24
-#define INITIAL_HEAP_SIZE			25
-#define INITIAL_HEAP_PERCENT		26
-#define MAX_HEAP_SIZE				27
-#define MAX_HEAP_PERCENT			28
-#define BUNDLED_JRE_64_BIT			29
-#define RUNTIME_BITS				30
-#define RESTART_ON_CRASH			31
-#define BUNDLED_JRE_AS_FALLBACK		32
-
-#define STARTUP_ERR					101
-#define BUNDLED_JRE_ERR				102
-#define JRE_VERSION_ERR				103
-#define LAUNCHER_ERR				104
-#define INSTANCE_ALREADY_EXISTS_MSG	105
diff --git a/packaging_tools/windows/launch4j/launch4j b/packaging_tools/windows/launch4j/launch4j
deleted file mode 100755
index 7d65191..0000000
--- a/packaging_tools/windows/launch4j/launch4j
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-LAUNCH4J="$(dirname "$0")"/launch4j.jar
-if [ -n "$JAVA_HOME" ]; then
-  $JAVA_HOME/bin/java -jar "$LAUNCH4J" "$@"
-else
-  java -jar "$LAUNCH4J" "$@"
-fi
diff --git a/packaging_tools/windows/launch4j/launch4j.jfpr b/packaging_tools/windows/launch4j/launch4j.jfpr
deleted file mode 100644
index a2e63eb..0000000
Binary files a/packaging_tools/windows/launch4j/launch4j.jfpr and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/lib/JGoodies.Forms.LICENSE.txt b/packaging_tools/windows/launch4j/lib/JGoodies.Forms.LICENSE.txt
deleted file mode 100644
index ae76541..0000000
--- a/packaging_tools/windows/launch4j/lib/JGoodies.Forms.LICENSE.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-              The BSD License for the JGoodies Forms
-              ======================================
-
-Copyright (c) 2002-2014 JGoodies Software GmbH. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
- o Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer. 
-    
- o Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution. 
-    
- o Neither the name of JGoodies Software GmbH nor the names of 
-   its contributors may be used to endorse or promote products derived 
-   from this software without specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packaging_tools/windows/launch4j/lib/JGoodies.Looks.LICENSE.txt b/packaging_tools/windows/launch4j/lib/JGoodies.Looks.LICENSE.txt
deleted file mode 100644
index 5aa0a24..0000000
--- a/packaging_tools/windows/launch4j/lib/JGoodies.Looks.LICENSE.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-              The BSD License for the JGoodies Looks
-              ======================================
-
-Copyright (c) 2001-2014 JGoodies Software GmbH. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
- o Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer. 
-    
- o Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution. 
-    
- o Neither the name of JGoodies Software GmbH nor the names of 
-   its contributors may be used to endorse or promote products derived 
-   from this software without specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packaging_tools/windows/launch4j/lib/Nuvola.Icon.Theme.LICENSE.txt b/packaging_tools/windows/launch4j/lib/Nuvola.Icon.Theme.LICENSE.txt
deleted file mode 100644
index b1e3f5a..0000000
--- a/packaging_tools/windows/launch4j/lib/Nuvola.Icon.Theme.LICENSE.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-

-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-

-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-

-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/packaging_tools/windows/launch4j/lib/XStream.LICENSE.txt b/packaging_tools/windows/launch4j/lib/XStream.LICENSE.txt
deleted file mode 100644
index 4848b3e..0000000
--- a/packaging_tools/windows/launch4j/lib/XStream.LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-(BSD Style License)
-
-Copyright (c) 2003-2004, Joe Walnes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of XStream nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/packaging_tools/windows/launch4j/lib/ant.LICENSE.txt b/packaging_tools/windows/launch4j/lib/ant.LICENSE.txt
deleted file mode 100644
index 261eeb9..0000000
--- a/packaging_tools/windows/launch4j/lib/ant.LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/packaging_tools/windows/launch4j/lib/commons.LICENSE.txt b/packaging_tools/windows/launch4j/lib/commons.LICENSE.txt
deleted file mode 100644
index e12244a..0000000
--- a/packaging_tools/windows/launch4j/lib/commons.LICENSE.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
- 
- Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
-    used to  endorse or promote  products derived from  this software without
-    prior written permission. For written permission, please contact
-    apache at apache.org.
- 
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano at apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
-*/
diff --git a/packaging_tools/windows/launch4j/lib/foxtrot.LICENSE.txt b/packaging_tools/windows/launch4j/lib/foxtrot.LICENSE.txt
deleted file mode 100644
index 49e0c5a..0000000
--- a/packaging_tools/windows/launch4j/lib/foxtrot.LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2002, Simone Bordet & Marco Cravero
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted 
-provided that the following conditions are met: 
-
-	- Redistributions of source code must retain the above copyright notice, 
-	  this list of conditions and the following disclaimer. 
-
-	- Redistributions in binary form must reproduce the above copyright notice, 
-	  this list of conditions and the following disclaimer in the documentation 
-	  and/or other materials provided with the distribution. 
-
-	- Neither the name of Foxtrot nor the names of the contributors may be used 
-	  to endorse or promote products derived from this software without specific prior 
-	  written permission.
-	  
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS 
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packaging_tools/windows/launch4j/manifest/uac.exe.manifest b/packaging_tools/windows/launch4j/manifest/uac.exe.manifest
deleted file mode 100644
index 3041fbc..0000000
--- a/packaging_tools/windows/launch4j/manifest/uac.exe.manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-        <security>
-            <requestedPrivileges>
-                <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-                <!-- <requestedExecutionLevel level="highestAvailable" uiAccess="false"/> -->
-                <!-- <requestedExecutionLevel level="requireAdministrator" uiAccess="false"/> -->
-            </requestedPrivileges>
-        </security>
-    </trustInfo>
-</assembly>    
\ No newline at end of file
diff --git a/packaging_tools/windows/launch4j/maven/.classpath b/packaging_tools/windows/launch4j/maven/.classpath
deleted file mode 100644
index 9f62fb5..0000000
--- a/packaging_tools/windows/launch4j/maven/.classpath
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="demo/SimpleApp/build" path="demo/SimpleApp/src"/>
-	<classpathentry kind="src" output="demo/ConsoleApp/build" path="demo/ConsoleApp/src"/>
-
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-
-</classpath>
diff --git a/packaging_tools/windows/launch4j/maven/.project b/packaging_tools/windows/launch4j/maven/.project
deleted file mode 100644
index 08f8689..0000000
--- a/packaging_tools/windows/launch4j/maven/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>launch4j</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/packaging_tools/windows/launch4j/maven/.settings/org.eclipse.m2e.core.prefs b/packaging_tools/windows/launch4j/maven/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/packaging_tools/windows/launch4j/maven/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/packaging_tools/windows/launch4j/maven/assembly/assemble-dist.xml b/packaging_tools/windows/launch4j/maven/assembly/assemble-dist.xml
deleted file mode 100644
index 20f2c17..0000000
--- a/packaging_tools/windows/launch4j/maven/assembly/assemble-dist.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>distribution-libs</id>
-	<formats>
-		<format>dir</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<dependencySets>
-		<dependencySet>
-			<includes></includes>
-			<useProjectArtifact>false</useProjectArtifact>
-		</dependencySet>
-	</dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/packaging_tools/windows/launch4j/maven/assembly/assemble-linux.xml b/packaging_tools/windows/launch4j/maven/assembly/assemble-linux.xml
deleted file mode 100644
index aa4abd0..0000000
--- a/packaging_tools/windows/launch4j/maven/assembly/assemble-linux.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Maven Launch4j Plugin
-Copyright (c) 2006 Paul Jungwirth
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<assembly>
-	<id>workdir-linux</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>bin/bin-linux</directory>
-			<outputDirectory>${finalName}-workdir-linux/bin</outputDirectory>
-		</fileSet>
-		<fileSet>			
-			<outputDirectory>${finalName}-workdir-linux</outputDirectory>
-			<includes>
-				<include>w32api/**/*</include>
-				<include>head/**/*</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/packaging_tools/windows/launch4j/maven/assembly/assemble-mac.xml b/packaging_tools/windows/launch4j/maven/assembly/assemble-mac.xml
deleted file mode 100644
index 30453be..0000000
--- a/packaging_tools/windows/launch4j/maven/assembly/assemble-mac.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Maven Launch4j Plugin
-Copyright (c) 2006 Paul Jungwirth
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<assembly>
-	<id>workdir-mac</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>bin/bin-macosx-x86</directory>
-			<outputDirectory>${finalName}-workdir-mac/bin</outputDirectory>
-		</fileSet>
-		<fileSet>			
-			<outputDirectory>${finalName}-workdir-mac</outputDirectory>
-			<includes>
-				<include>w32api/**/*</include>
-				<include>head/**/*</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/packaging_tools/windows/launch4j/maven/assembly/assemble-solaris.xml b/packaging_tools/windows/launch4j/maven/assembly/assemble-solaris.xml
deleted file mode 100644
index 945d360..0000000
--- a/packaging_tools/windows/launch4j/maven/assembly/assemble-solaris.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Maven Launch4j Plugin
-Copyright (c) 2006 Paul Jungwirth
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<assembly>
-	<id>workdir-solaris</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>bin/solaris</directory>
-			<outputDirectory>${finalName}-workdir-solaris/bin</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<outputDirectory>${finalName}-workdir-solaris</outputDirectory>
-			<includes>
-				<include>w32api/**/*</include>
-				<include>head/**/*</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/packaging_tools/windows/launch4j/maven/assembly/assemble-win32.xml b/packaging_tools/windows/launch4j/maven/assembly/assemble-win32.xml
deleted file mode 100644
index 5f382fc..0000000
--- a/packaging_tools/windows/launch4j/maven/assembly/assemble-win32.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Maven Launch4j Plugin
-Copyright (c) 2006 Paul Jungwirth
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<assembly>
-	<id>workdir-win32</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>bin/bin-win32</directory>
-			<outputDirectory>${finalName}-workdir-win32/bin</outputDirectory>
-		</fileSet>
-		<fileSet>
-<!-- 			<directory>src/main</directory> -->
-			<outputDirectory>${finalName}-workdir-win32</outputDirectory>
-			<includes>
-				<include>w32api/**/*</include>
-				<include>head/**/*</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/packaging_tools/windows/launch4j/maven/assembly/src.xml b/packaging_tools/windows/launch4j/maven/assembly/src.xml
deleted file mode 100644
index c930835..0000000
--- a/packaging_tools/windows/launch4j/maven/assembly/src.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Maven Launch4j Plugin
-Copyright (c) 2006 Paul Jungwirth
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<assembly>
-  <id>src</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>TODO</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src</directory>
-	  <excludes>
-		  <exclude>**/.*.swp</exclude>
-	  </excludes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/packaging_tools/windows/launch4j/maven/maven-readme.txt b/packaging_tools/windows/launch4j/maven/maven-readme.txt
deleted file mode 100644
index 8429754..0000000
--- a/packaging_tools/windows/launch4j/maven/maven-readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Run once the Ant target switch-to-maven, it will reconfigure the project to use maven.
-
-*** Creation of Distribution Release ***
-Windows: mvn -P dist,win32 clean package
-
-Linux: mvn -P dist,linux clean package  
-
-MacOsX 10.8: mvn -P dist,macosx-x86-10.8 clean package
-
-MacOsX: mvn -P dist,macosx-x86 clean package
diff --git a/packaging_tools/windows/launch4j/maven/pom.xml b/packaging_tools/windows/launch4j/maven/pom.xml
deleted file mode 100644
index 3d614c0..0000000
--- a/packaging_tools/windows/launch4j/maven/pom.xml
+++ /dev/null
@@ -1,518 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>net.sf.launch4j</groupId>
-	<artifactId>launch4j</artifactId>
-	<version>3.8.0</version>
-	<name>Launch4j</name>
-	<description>Cross-platform Java executable wrapper for creating lightweight Windows native EXEs. Provides advanced JRE search, application startup configuration and better user experience.</description>
-	<url>http://sourceforge.net/projects/launch4j/</url>
-
-	<licenses>
-		<license>
-			<name>BSD 3-Clause License</name>
-			<url>http://opensource.org/licenses/BSD-3-Clause</url>
-			<comments>Launch4j is licensed under the BSD 3-Clause License.</comments>
-		</license>
-		<license>
-			<name>MIT License</name>
-			<url>http://www.opensource.org/licenses/mit-license.php</url>
-			<comments>Launch4j code (head) which is attached to the wrapped jars is licensed under the MIT License.</comments>
-		</license>
-	</licenses>
-
-	<developers>
-		<developer>
-			<name>Grzegorz Kowal</name>
-			<url>http://sourceforge.net/u/grzegok/profile/</url>
-		</developer>
-	</developers>
-
-	<scm>
-		<connection>scm:git:http://git.code.sf.net/p/launch4j/git</connection>
-		<developerConnection>scm:git:http://git.code.sf.net/p/launch4j/git</developerConnection>
-		<url>http://sourceforge.net/p/launch4j/git/ci/master/tree/</url>
-	</scm>
-
-	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<versionNumber>3.8.0.0</versionNumber>
-		<version>3.8</version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-collections</artifactId>
-					<groupId>commons-collections</groupId>
-				</exclusion>
-			</exclusions>
-			<version>1.7.0</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>net.java.abeille</groupId>
-			<artifactId>abeille</artifactId>
-			<version>3.0</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>colt</artifactId>
-					<groupId>colt</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>
-						com.springsource.org.apache.batik.ext.awt
-					</artifactId>
-					<groupId>org.apache.batik</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>
-						com.springsource.org.apache.batik.util
-					</artifactId>
-					<groupId>org.apache.batik</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>dom4j</artifactId>
-					<groupId>dom4j</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>dsol-xml</artifactId>
-					<groupId>dsol</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>javahelp</artifactId>
-					<groupId>javax.help</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>jfreechart</artifactId>
-					<groupId>jfree</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>jcommon</artifactId>
-					<groupId>jfree</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>mahout-collections</artifactId>
-					<groupId>org.apache.mahout</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>optimization</artifactId>
-					<groupId>com.github.rwl</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>foxtrot</groupId>
-			<artifactId>foxtrot</artifactId>
-			<version>2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jgoodies</groupId>
-			<artifactId>jgoodies-common</artifactId>
-			<version>1.7.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jgoodies</groupId>
-			<artifactId>forms</artifactId>
-			<version>1.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jgoodies</groupId>
-			<artifactId>looks</artifactId>
-			<version>2.2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<version>1.4.8</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>1.8.2</version>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>src</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.github.taxone.plugins</groupId>
-				<artifactId>classpath-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<executions>
-					<execution>
-						<id>set-classpath-property</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>setClassPath</goal>
-						</goals>
-						<configuration>
-							<classpathPrefix>lib/</classpathPrefix>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>default-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifest>
-									<mainClass>net.sf.launch4j.Main</mainClass>
-								</manifest>
-								<manifestEntries>
-									<Class-Path>. ${taxone.classpath.propertyName}</Class-Path>
-								</manifestEntries>
-							</archive>
-						</configuration>
-					</execution>
-					<execution>
-						<id>core-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.build.finalName}</finalName>
-							<excludes>
-								<exclude>net/sf/launch4j/form/</exclude>
-								<exclude>net/sf/launch4j/formimpl</exclude>
-							</excludes>
-							<classifier>core</classifier>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4.1</version>
-				<executions>
-					<execution>
-						<id>assemble-workdir</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attached</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>assembly/assemble-linux.xml</descriptor>
-								<descriptor>assembly/assemble-win32.xml</descriptor>
-								<descriptor>assembly/assemble-mac.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assemble-distrib</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<finalName>lib</finalName>
-							<outputDirectory>${basedir}</outputDirectory>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptors>
-								<descriptor>assembly/assemble-dist.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>target</directory>
-									<includes>
-										<include>${project.build.finalName}.jar</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${basedir}</directory>
-							<includes>
-								<include>${project.build.finalName}.jar</include>
-							</includes>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>full-release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<version>2.3</version>
-						<executions>
-							<execution>
-								<id>attach-sources</id>
-								<goals>
-									<goal>jar-no-fork</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.9.1</version>
-						<executions>
-							<execution>
-								<id>attach-javadocs</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.5</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.2</version>
-						<extensions>true</extensions>
-						<configuration>
-							<serverId>ossrh</serverId>
-							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-							<!-- Release has to be executed manually -->
-							<autoReleaseAfterClose>false</autoReleaseAfterClose>
-						</configuration>
-					</plugin>
-
-				</plugins>
-			</build>
-		</profile>
-		<!-- Macosx-x86 10.8 Profile -->
-		<profile>
-			<id>macosx-x86-10.8</id>
-			<properties>
-				<bin.dir>bin-macosx-x86-10.8</bin.dir>
-			</properties>
-		</profile>
-		<!-- Macosx-x86 Profile -->
-		<profile>
-			<id>macosx-x86</id>
-			<properties>
-				<bin.dir>bin-macosx-x86</bin.dir>
-			</properties>
-		</profile>
-		<!-- Linux Profile -->
-		<profile>
-			<id>linux</id>
-			<properties>
-				<bin.dir>bin-linux</bin.dir>
-			</properties>
-		</profile>
-		<!-- Windows Profile -->
-		<profile>
-			<id>win32</id>
-			<properties>
-				<bin.dir>bin-win32</bin.dir>
-			</properties>
-			<build>
-				<plugins>					
-					<!-- Creates Launch4j executable -->
-					<plugin>
-						<groupId>com.akathist.maven.plugins.launch4j</groupId>
-						<artifactId>launch4j-maven-plugin</artifactId>
-						<version>1.6</version>
-						<executions>
-							<execution>
-								<id>launch4j</id>
-								<phase>package</phase>
-								<goals>
-									<goal>launch4j</goal>
-								</goals>
-								<configuration>
-									<headerType>gui</headerType>
-									<dontWrapJar>true</dontWrapJar>
-									<jar>${project.build.finalName}.jar</jar>
-									<outfile>launch4j.exe</outfile>
-									<errTitle>launch4j</errTitle>
-									<chdir>.</chdir>
-									<stayAlive>false</stayAlive>
-
-									<jre>
-										<minVersion>1.6.0</minVersion>
-									</jre>
-									<versionInfo>
-										<fileVersion>${versionNumber}</fileVersion>
-										<txtFileVersion>${version}</txtFileVersion>
-										<productVersion>${versionNumber}</productVersion>
-										<txtProductVersion>${version}</txtProductVersion>
-										<fileDescription>Cross-platform Java application wrapper</fileDescription>
-										<copyright>Copyright (C) 2004, 2014 Grzegorz Kowal</copyright>
-										<productName>launch4j</productName>
-										<companyName>http://launch4j.sourceforge.net/</companyName>
-										<internalName>GUI launcher</internalName>
-										<originalFilename>launch4j.exe</originalFilename>
-									</versionInfo>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<!-- Generic distribution profile -->
-		<profile>
-			<id>dist</id>			
-			<build>
-				<plugins>
-					<!-- Clean -->
-					<plugin>
-						<artifactId>maven-clean-plugin</artifactId>
-						<version>2.6</version>
-						<configuration>
-							<filesets>								
-								<fileset>
-									<directory>${basedir}/bin</directory>
-									<includes>
-										<incude>*</incude>
-									</includes>
-									<excludes>
-										<exclude>COPYING</exclude>
-									</excludes>
-								</fileset>
-								<fileset>
-									<directory>${basedir}</directory>
-									<includes>
-										<incude>launch4j.exe</incude>
-									</includes>
-								</fileset>		
-								<fileset>
-									<directory>${basedir}</directory>
-									<includes>
-										<incude>lib/</incude>
-									</includes>
-								</fileset>
-							</filesets>
-						</configuration>
-					</plugin>
-					<!-- Copies executables to "bin" directory -->
-					<plugin>
-						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.6</version>
-						<executions>
-							<execution>
-								<id>copy-binutils</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${basedir}/bin</outputDirectory>
-									<resources>
-										<resource>
-											<directory>${basedir}/bin/${bin.dir}</directory>
-										</resource>
-									</resources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<!-- Change Permissions -->
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
-						<executions>
-							<execution>
-								<phase>package</phase>
-								<configuration>
-									<target>
-										<chmod file="launch4j" perm="+x" />
-										<chmod file="bin/windres" perm="+x" />
-										<chmod file="bin/ld" perm="+x" />
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	
-	
-	</profiles>
-
-</project>
\ No newline at end of file
diff --git a/packaging_tools/windows/launch4j/sign4j/README.txt b/packaging_tools/windows/launch4j/sign4j/README.txt
deleted file mode 100644
index a05b644..0000000
--- a/packaging_tools/windows/launch4j/sign4j/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-sign4j version 3.0
-------------------
-
-sign4j is a very simple utility to digitally sign executables containing an appended jar file, like those created by launch4j.
-
-It works by first signing a temporary file to detect the size of the applied signature, and by then adding that size to a counter in the ZIP_END_HEADER of the embedded jar, so as to pretend that the signature is a comment belonging to it. That way the jar remains formally correct, and java accepts it.
-
-This manipulation must be done atomically with the signing process, because doing it before would invalidate the jar file, while doing it later would break the signature. That's why the whole command line of your signing tool must be passed to sign4j, which will do the job.
-
-Any signing tool can be used, as long as the name of the output file can be recognized among its parameters. This is currently done by either using an -out option if present, or taking the last filename with an exe suffix after all supplied options.
-
-If the involved tool is able to remove a previous signature before adding the new one (as is normally the case) the initial test can be performed on the target executable itself, avoiding the creation of a temporary file. You can use the option --onthespot to signal that to sign4j.
-
-The option --strict can be used to suppress the use of double quotes around parameters that strictly don't need them. The option --verbose shows diagnostics about intermediary steps of the process.
-
-This utility can also be used to sign normal executables, but then it will remember you that the file can be signed directly.
-
-Please send comments to bramfeld at diogen.de
diff --git a/packaging_tools/windows/launch4j/sign4j/sign4j.c b/packaging_tools/windows/launch4j/sign4j/sign4j.c
deleted file mode 100644
index 475334e..0000000
--- a/packaging_tools/windows/launch4j/sign4j/sign4j.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-	sign4j.c: a simple utility to sign executables created by Launch4j
-
-	Copyright (c) 2012 Servoy
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifdef _WIN32
-#include <io.h>
-#include <fcntl.h>
-#else
-#include <sys/io.h>
-#include <sys/fcntl.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#define ZIP_END_HEADER     "\x50\x4B\x05\x06"
-#define END_HEADER_SIZE    22
-#define MAX_COMMENT_SIZE   0xFFFF
-#define SWAP_BLOCK_SIZE    (4 * 1024 * 1024)
-#define TEST_FILE_NAME     "sign4j_temporary.exe"
-#define SIGN4J_VERSION     "3.0"
-
-#ifndef _WIN32
-#define O_BINARY 0
-#define _O_SHORT_LIVED 0
-#define _S_IREAD S_IREAD
-#define _S_IWRITE S_IWRITE
-#define stricmp strcasecmp
-#endif
-
-typedef unsigned char byte;
-
-char  command[4096];
-byte* image = 0;
-
-void usage (void);
-void quit (int rsn);
-void clear (void);
-
-int main (int argc, char* argv[])
-{
-   char  bfr[2];
-   char* inf;
-   char* outf;
-   char* trg;
-   byte* lmt;
-   long  lng, ext, off, blck, sgm;
-   int   fd, td;
-   int   fnd, spt, unq, vrb, qts, cmn;
-   int   i, j, n;
-   byte* p;
-
-   inf = outf = 0, fnd = spt = unq = vrb = 0;
-   for (i = 1; i < argc && argv[i][0] == '-'; i++)
-      if (! strcmp (argv[i], "--onthespot")) 
-         spt = 1;
-      else if (! strcmp (argv[i], "--strict")) 
-         unq = 1;
-      else if (! strcmp (argv[i], "--verbose")) 
-         vrb = 1;
-   j = i;
-   for (i = j + 1; i < argc; i++)
-      if (! strcmp (argv[i], "-in") && i < argc - 1) 
-         inf = argv[++i], fnd = 1;
-      else if (! strcmp (argv[i], "-out") && i < argc - 1) 
-         outf = argv[++i], fnd = 1;
-      else if (argv[i][0] == '-' || (argv[i][0] == '/' && strlen (argv[i]) < 5))
-         (! fnd ? (inf = outf = 0) : 0);
-      else if (! fnd && (n = strlen (argv[i])) > 4 && ! stricmp (argv[i] + n - 4, ".exe"))
-         inf = outf = argv[i];
-   if (! inf || ! outf)
-      usage ();
-   atexit (clear);
-
-   if ((fd = open (inf, O_RDONLY | O_BINARY)) < 0)
-      quit (1);
-   if ((lng = lseek (fd, 0, SEEK_END)) < 0)
-      quit (2);
-   blck = (lng > SWAP_BLOCK_SIZE ? SWAP_BLOCK_SIZE : lng);
-   if (! (image = (byte*) malloc (blck)))
-      quit (4);
-   sgm = (blck > END_HEADER_SIZE + MAX_COMMENT_SIZE ? END_HEADER_SIZE + MAX_COMMENT_SIZE : blck);
-   if (lseek (fd, -sgm, SEEK_END) < 0 || read (fd, image, sgm) != sgm)
-      quit (2);
-   for (p = image + sgm - END_HEADER_SIZE; p > image; p--)
-      if (! memcmp (p, ZIP_END_HEADER, 4) && ((p[END_HEADER_SIZE - 1] << 8) | p[END_HEADER_SIZE - 2]) == (image + sgm) - (p + END_HEADER_SIZE))
-         break;
-   if (p > image)
-   {
-      off = lng - ((image + sgm) - (p + END_HEADER_SIZE - 2));
-      cmn = (p[END_HEADER_SIZE - 1] << 8) | p[END_HEADER_SIZE - 2];
-
-      if (! spt && (inf == outf || ! strcmp (inf, outf)))
-      {
-         printf ("Making temporary file\n");
-         if ((td = open (TEST_FILE_NAME, O_CREAT | _O_SHORT_LIVED | O_WRONLY | O_BINARY, _S_IREAD | _S_IWRITE)) < 0)
-            quit (5);
-         if (lseek (fd, 0, SEEK_SET) < 0)
-            quit (2);
-         for (ext = lng; ext > 0; ext -= blck)
-         {
-            sgm = (ext > blck ? blck : ext);
-            if (read (fd, image, sgm) != sgm || write (td, image, sgm) != sgm)
-               quit (6);
-         }
-         close (td);
-         trg = TEST_FILE_NAME;
-      }
-      else
-         trg = outf;
-      close (fd);
-
-#ifdef _WIN32
-      strcpy (command,  "\" ");
-#else
-      strcpy (command, "");
-#endif
-
-      for (i = j; i < argc; i++)
-      {
-         p = (argv[i] == outf ? trg : argv[i]);
-         qts = (! unq || strchr (p, 32));
-         if (qts)
-            strcat (command, "\"");
-         strcat (command, p);
-         if (qts)
-            strcat (command, "\"");
-         strcat (command, " ");
-      }
-
-#ifdef _WIN32
-      strcat (command, "\"");
-#endif
-
-      if (! vrb)
-#ifdef _WIN32
-         strcat (command, " > NUL");
-#else
-         strcat (command, " > /dev/null");
-#endif
-
-      system (command);
-
-      if ((td = open (trg, O_RDONLY | O_BINARY)) < 0)
-         quit (7);
-      if ((ext = lseek (td, 0, SEEK_END)) < 0)
-         quit (7);
-      close (td);
-      if ((cmn += ext - lng) < 0 || cmn > MAX_COMMENT_SIZE)
-         quit (8);
-
-      if ((fd = open (inf, O_WRONLY | O_BINARY)) < 0)
-         quit (1);
-      if (lseek (fd, off, SEEK_SET) < 0)
-         quit (3);
-      bfr[0] = cmn & 0xFF;
-      bfr[1] = (cmn >> 8) & 0xFF;
-      if (write (fd, bfr, 2) != 2)
-         quit (3);
-      close (fd);
-   }
-   else
-   {
-      close (fd);
-      printf ("You don't need sign4j to sign this file\n");
-   }
-
-#ifdef _WIN32
-   strcpy (command,  "\" ");
-#else
-   strcpy (command, "");
-#endif
-
-   for (i = j; i < argc; i++)
-   {
-      p = argv[i];
-      qts = (! unq || strchr (p, 32));
-      if (qts)
-         strcat (command, "\"");
-      strcat (command, p);
-      if (qts)
-         strcat (command, "\"");
-      strcat (command, " ");
-   }
-
-#ifdef _WIN32
-   strcat (command, "\"");
-#endif
-
-   return system (command);
-}
-
-
-void usage ()
-{
-   printf ("\nThis is sign4j version " SIGN4J_VERSION "\n\n");
-   printf ("Usage: sign4j [options] <arguments>\n\n");
-   printf (" * options:\n");
-   printf ("    --onthespot   avoid the creation of a temporary file (your tool must be able to sign twice)\n");
-   printf ("    --strict      supress the use of double quotes around parameters that strictly don't need them\n");
-   printf ("    --verbose     show diagnostics about intermediary steps of the process\n");
-   printf (" * arguments must specify verbatim the command line for your signing tool\n");
-   printf (" * only one file can be signed on each invocation\n");
-   exit (-1);
-}
-
-void quit (int rsn)
-{
-   switch (rsn)
-   {
-   case 1: puts ("Could not open file\n"); break;
-   case 2: puts ("Could not read file\n"); break;
-   case 3: puts ("Could not write file\n"); break;
-   case 4: puts ("Not enough memory\n"); break;
-   case 5: puts ("Could not open temporary\n"); break;
-   case 6: puts ("Could not write temporary\n"); break;
-   case 7: puts ("Could not read target\n"); break;
-   case 8: puts ("Unsupported operation\n"); break;
-   }
-   exit (-1);
-}
-
-void clear ()
-{
-   if (access (TEST_FILE_NAME, 0) == 0)
-      remove (TEST_FILE_NAME);
-   if (image)
-      free (image);
-}
diff --git a/packaging_tools/windows/launch4j/src/LICENSE.txt b/packaging_tools/windows/launch4j/src/LICENSE.txt
deleted file mode 100644
index bf03c83..0000000
--- a/packaging_tools/windows/launch4j/src/LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (c) 2004, 2015 Grzegorz Kowal
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/packaging_tools/windows/launch4j/src/images/asterix-o.gif b/packaging_tools/windows/launch4j/src/images/asterix-o.gif
deleted file mode 100644
index f5cf3b3..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/asterix-o.gif and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/asterix.gif b/packaging_tools/windows/launch4j/src/images/asterix.gif
deleted file mode 100644
index ba80167..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/asterix.gif and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/build.png b/packaging_tools/windows/launch4j/src/images/build.png
deleted file mode 100644
index 625285f..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/build.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/button_ok.png b/packaging_tools/windows/launch4j/src/images/button_ok.png
deleted file mode 100644
index 5b0f6a6..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/button_ok.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/cancel16.png b/packaging_tools/windows/launch4j/src/images/cancel16.png
deleted file mode 100644
index a432b49..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/cancel16.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/down16.png b/packaging_tools/windows/launch4j/src/images/down16.png
deleted file mode 100644
index f3bc4cd..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/down16.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/edit_add16.png b/packaging_tools/windows/launch4j/src/images/edit_add16.png
deleted file mode 100644
index e948508..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/edit_add16.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/info.png b/packaging_tools/windows/launch4j/src/images/info.png
deleted file mode 100644
index eb37d9a..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/info.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/new.png b/packaging_tools/windows/launch4j/src/images/new.png
deleted file mode 100644
index 6e2700a..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/new.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/new16.png b/packaging_tools/windows/launch4j/src/images/new16.png
deleted file mode 100644
index f38d02e..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/new16.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/ok16.png b/packaging_tools/windows/launch4j/src/images/ok16.png
deleted file mode 100644
index 5b0f6a6..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/ok16.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/open.png b/packaging_tools/windows/launch4j/src/images/open.png
deleted file mode 100644
index a801665..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/open.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/open16.png b/packaging_tools/windows/launch4j/src/images/open16.png
deleted file mode 100644
index 5321c17..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/open16.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/run.png b/packaging_tools/windows/launch4j/src/images/run.png
deleted file mode 100644
index b41fa2b..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/run.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/save.png b/packaging_tools/windows/launch4j/src/images/save.png
deleted file mode 100644
index 74b37b0..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/save.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/images/up16.png b/packaging_tools/windows/launch4j/src/images/up16.png
deleted file mode 100644
index 184c118..0000000
Binary files a/packaging_tools/windows/launch4j/src/images/up16.png and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/launch4j.properties b/packaging_tools/windows/launch4j/src/launch4j.properties
deleted file mode 100644
index 5ebbeb0..0000000
--- a/packaging_tools/windows/launch4j/src/launch4j.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-versionNumber=3.8.0.0
-version=3.8
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Builder.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/Builder.java
deleted file mode 100644
index 4b6452f..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Builder.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on 2005-04-24
- */
-package net.sf.launch4j;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import net.sf.launch4j.binding.InvariantViolationException;
-import net.sf.launch4j.config.Config;
-import net.sf.launch4j.config.ConfigPersister;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Builder {
-	private final Log _log;
-	private final File _basedir;
-
-	public Builder(Log log) {
-		_log = log;
-		_basedir = Util.getJarBasedir();
-	}
-
-	public Builder(Log log, File basedir) {
-		_log = log;
-		_basedir = basedir;
-	}
-
-	/**
-	 * @return Output file path.
-	 */
-	public File build() throws BuilderException {
-		final Config c = ConfigPersister.getInstance().getConfig();
-		try {
-			c.validate();
-		} catch (InvariantViolationException e) {
-			throw new BuilderException(e.getMessage());
-		}
-		File rc = null;
-		File ro = null;
-		File outfile = null;
-		FileInputStream is = null;
-		FileOutputStream os = null;
-		final RcBuilder rcb = new RcBuilder();
-		try {
-			rc = rcb.build(c);
-			ro = Util.createTempFile("o");
-			outfile = ConfigPersister.getInstance().getOutputFile();
-
-			Cmd resCmd = new Cmd(_basedir);
-			resCmd.addExe("windres")
-					.add(Util.WINDOWS_OS ? "--preprocessor=type" : "--preprocessor=cat")
-					.add("-J rc -O coff -F pe-i386")
-					.addAbsFile(rc)
-					.addAbsFile(ro);
-			_log.append(Messages.getString("Builder.compiling.resources"));
-			resCmd.exec(_log);
-
-			Cmd ldCmd = new Cmd(_basedir);
-			ldCmd.addExe("ld")
-					.add("-mi386pe")
-					.add("--oformat pei-i386")
-					.add("--dynamicbase")
-					.add("--nxcompat")
-					.add("--no-seh")
-					.add((c.getHeaderType().equals(Config.GUI_HEADER))
-							? "--subsystem windows" : "--subsystem console")
-					.add("-s")		// strip symbols
-					.addFiles(c.getHeaderObjects())
-					.addAbsFile(ro)
-					.addFiles(c.getLibs())
-					.add("-o")
-					.addAbsFile(outfile);
-			_log.append(Messages.getString("Builder.linking"));
-			ldCmd.exec(_log);
-
-			if (!c.isDontWrapJar()) {
-				_log.append(Messages.getString("Builder.wrapping"));
-				int len;
-				byte[] buffer = new byte[1024];
-				is = new FileInputStream(Util.getAbsoluteFile(
-						ConfigPersister.getInstance().getConfigPath(),	c.getJar()));
-				os = new FileOutputStream(outfile, true);
-				while ((len = is.read(buffer)) > 0) {
-					os.write(buffer, 0, len);
-				}
-			}
-			_log.append(Messages.getString("Builder.success") + outfile.getPath());
-			return outfile;
-		} catch (IOException e) {
-			Util.delete(outfile);
-			_log.append(e.getMessage());
-			throw new BuilderException(e);
-		} catch (ExecException e) {
-			Util.delete(outfile);
-			String msg = e.getMessage(); 
-			if (msg != null && msg.indexOf("windres") != -1) {
-				if (e.getErrLine() != -1) {
-					_log.append(Messages.getString("Builder.line.has.errors",
-							String.valueOf(e.getErrLine())));
-					_log.append(rcb.getLine(e.getErrLine()));
-				} else {
-					_log.append(Messages.getString("Builder.generated.resource.file"));
-					_log.append(rcb.getContent());
-				}
-			}
-			throw new BuilderException(e);
-		} finally {
-			Util.close(is);
-			Util.close(os);
-			Util.delete(rc);
-			Util.delete(ro);
-		}
-	}
-}
-
-class Cmd {
-	private final List<String> _cmd = new ArrayList<String>();
-	private final File _basedir;
-	private final File _bindir;
-
-	public Cmd(File basedir) {
-		_basedir = basedir;
-		String path = System.getProperty("launch4j.bindir");
-
-		if (path == null) {
-			_bindir = new File(basedir, "bin");
-		} else {
-			File bindir = new File(path);
-			_bindir = bindir.isAbsolute() ? bindir : new File(basedir, path);
-		}
-	}
-
-	public Cmd add(String s) {
-		StringTokenizer st = new StringTokenizer(s);
-
-		while (st.hasMoreTokens()) {
-			_cmd.add(st.nextToken());
-		}
-
-		return this;
-	}
-
-	public Cmd addAbsFile(File file) {
-		_cmd.add(file.getPath());
-		return this;
-	}
-
-	public Cmd addFile(String pathname) {
-		_cmd.add(new File(_basedir, pathname).getPath());
-		return this;
-	}
-
-	public Cmd addExe(String pathname) {
-		if (Util.WINDOWS_OS) {
-			pathname += ".exe";
-		}
-
-		_cmd.add(new File(_bindir, pathname).getPath());
-		return this;
-	}
-
-	public Cmd addFiles(List<String> files) {
-		for (String f : files) {
-			addFile(f);
-		}
-
-		return this;
-	}
-
-	public void exec(Log log) throws ExecException {
-		String[] cmd = (String[]) _cmd.toArray(new String[_cmd.size()]);
-		Util.exec(cmd, log);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/BuilderException.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/BuilderException.java
deleted file mode 100644
index 76d814d..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/BuilderException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 13, 2005
- */
-package net.sf.launch4j;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class BuilderException extends Exception {
-	public BuilderException() {}
-
-	public BuilderException(Throwable t) {
-		super(t);
-	}
-	
-	public BuilderException(String msg) {
-		super(msg);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ExecException.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ExecException.java
deleted file mode 100644
index 059b2a8..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ExecException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 14, 2005
- */
-package net.sf.launch4j;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class ExecException extends Exception {
-	private final int _errLine;
-
-	public ExecException(Throwable t, int errLine) {
-		super(t);
-		_errLine = errLine;
-	}
-
-	public ExecException(Throwable t) {
-		this(t, -1);
-	}
-
-	public ExecException(String msg, int errLine) {
-		super(msg);
-		_errLine = errLine;
-	}
-
-	public ExecException(String msg) {
-		this(msg, -1);
-	}
-
-	public int getErrLine() {
-		return _errLine;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/FileChooserFilter.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/FileChooserFilter.java
deleted file mode 100644
index e4d8d6f..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/FileChooserFilter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on 2004-01-15
- */
-package net.sf.launch4j;
-
-import java.io.File;
-
-import javax.swing.filechooser.FileFilter;
-
-/**
- * @author Copyright (C) 2004 Grzegorz Kowal
- */
-public class FileChooserFilter extends FileFilter {
-	String _description;
-	String[] _extensions;
-
-	public FileChooserFilter(String description, String extension) {
-		_description = description;
-		_extensions = new String[] {extension};
-	}
-	
-	public FileChooserFilter(String description, String[] extensions) {
-		_description = description;
-		_extensions = extensions;
-	}
-
-	public boolean accept(File f) {
-		if (f.isDirectory()) {
-			return true;
-		}
-		String ext = Util.getExtension(f);
-		for (int i = 0; i < _extensions.length; i++) {
-			if (ext.toLowerCase().equals(_extensions[i].toLowerCase())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String getDescription() {
-		return _description;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/KanjiEscapeOutputStream.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/KanjiEscapeOutputStream.java
deleted file mode 100644
index 9f26726..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/KanjiEscapeOutputStream.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2013 toshimm
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.sf.launch4j;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * @author toshimm (2013)
- * 
- *         This class makes Japanese Kanji characters in MS932 charcode escaped
- *         in octal form.
- */
-public class KanjiEscapeOutputStream extends OutputStream {
-
-	protected OutputStream parent;
-
-	public KanjiEscapeOutputStream(OutputStream out) {
-		this.parent = out;
-	}
-
-	private final int MASK = 0x000000FF;
-	private boolean state = true;
-
-	public void write(int b) throws IOException {
-		b = b & MASK;
-
-		if (state) {
-			if (0x00 <= b && b <= 0x7f) {
-				this.parent.write(b);
-			} else {
-				this.octprint(b);
-				if ((0x81 <= b && b <= 0x9f) || (0xe0 <= b && b <= 0xfc)) {
-					this.state = false;
-				}
-			}
-		} else {
-			if ((0x40 <= b && b <= 0x7e) || (0x80 <= b && b <= 0xfc)) {
-				this.octprint(b);
-			} else if (0x00 <= b && b <= 0x7f) {
-				this.parent.write(b);
-			} else {
-				this.octprint(b);
-			}
-			this.state = true;
-		}
-	}
-
-	private void octprint(int b) throws IOException {
-		String oct = "\\" + String.format("%o", b & MASK);
-		for (int i = 0; i < oct.length(); ++i) {
-			int bb = oct.charAt(i);
-			this.parent.write(bb);
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Log.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/Log.java
deleted file mode 100644
index 369befc..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Log.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 12, 2005
- */
-package net.sf.launch4j;
-
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public abstract class Log {
-	private static final Log _consoleLog = new ConsoleLog();
-	private static final Log _antLog = new AntLog();
-
-	public abstract void clear();
-	public abstract void append(String line);
-
-	public static Log getConsoleLog() {
-		return _consoleLog;
-	}
-	
-	public static Log getAntLog() {
-		return _antLog;
-	}
-
-	public static Log getSwingLog(JTextArea textArea) {
-		return new SwingLog(textArea);
-	}
-}
-
-class ConsoleLog extends Log {
-	public void clear() {
-		System.out.println("\n");
-	}
-
-	public void append(String line) {
-		System.out.println("launch4j: " + line);
-	}
-}
-
-class AntLog extends Log {
-	public void clear() {
-		System.out.println("\n");
-	}
-
-	public void append(String line) {
-		System.out.println(line);
-	}
-}
-
-class SwingLog extends Log {
-	private final JTextArea _textArea;
-
-	public SwingLog(JTextArea textArea) {
-		_textArea = textArea;
-	}
-
-	public void clear() {
-		SwingUtilities.invokeLater(new Runnable() {
-			public void run() {
-				_textArea.setText("");
-		}});
-	}
-
-	public void append(final String line) {
-		SwingUtilities.invokeLater(new Runnable() {
-			public void run() {
-				_textArea.append(line + "\n");
-		}});
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Main.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/Main.java
deleted file mode 100644
index 1c1048c..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Main.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 21, 2005
- */
-package net.sf.launch4j;
-
-import java.io.File;
-import java.util.Properties;
-
-import net.sf.launch4j.config.ConfigPersister;
-import net.sf.launch4j.formimpl.MainFrame;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Main {
-	private static String _name; 
-	private static String _description;
-
-	public static void main(String[] args) {
-		try {
-			Properties props = Util.getProperties();
-			setDescription(props);
-
-			if (args.length == 0) {
-				ConfigPersister.getInstance().createBlank();
-				MainFrame.createInstance();
-			} else if (args.length == 1 && !args[0].startsWith("-")) {
-				ConfigPersister.getInstance().load(new File(args[0]));
-				Builder b = new Builder(Log.getConsoleLog());
-				b.build();
-			} else {
-				System.out.println(_description
-						+ Messages.getString("Main.usage")
-						+ ": launch4j config.xml");
-			}
-		} catch (Exception e) {
-			Log.getConsoleLog().append(e.getMessage());
-		} 
-	}
-
-	public static String getName() {
-		return _name;
-	}
-
-	public static String getDescription() {
-		return _description;
-	}
-
-	private static void setDescription(Properties props) {
-		_name = "Launch4j " + props.getProperty("version"); 
-		_description = _name + 
-				" (http://launch4j.sourceforge.net/)\n" +
-				"Cross-platform Java application wrapper" +
-						" for creating Windows native executables.\n\n" +
-				"Copyright (C) 2004, 2015 Grzegorz Kowal\n\n" +
-				"Launch4j comes with ABSOLUTELY NO WARRANTY.\n" +
-				"This is free software, licensed under the BSD License.\n" +
-				"This product includes software developed by the Apache Software Foundation" +
-						" (http://www.apache.org/).";
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Messages.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/Messages.java
deleted file mode 100644
index 687683d..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Messages.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "net.sf.launch4j.messages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-	private static final MessageFormat FORMATTER = new MessageFormat("");
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-	
-	public static String getString(String key, String arg0) {
-		return getString(key, new Object[] {arg0});
-	}
-
-	public static String getString(String key, String arg0, String arg1) {
-		return getString(key, new Object[] {arg0, arg1});
-	}
-
-	public static String getString(String key, String arg0, String arg1, String arg2) {
-		return getString(key, new Object[] {arg0, arg1, arg2});
-	}
-
-	public static String getString(String key, Object[] args) {
-		try {
-			FORMATTER.applyPattern(RESOURCE_BUNDLE.getString(key));
-			return FORMATTER.format(args);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/RcBuilder.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/RcBuilder.java
deleted file mode 100644
index ccd942d..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/RcBuilder.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on 2005-04-24
- */
-package net.sf.launch4j;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.List;
-
-import net.sf.launch4j.config.Config;
-import net.sf.launch4j.config.ConfigPersister;
-import net.sf.launch4j.config.Jre;
-import net.sf.launch4j.config.Msg;
-import net.sf.launch4j.config.Splash;
-import net.sf.launch4j.config.VersionInfo;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class RcBuilder {
-
-	// winnt.h
-	public static final int LANG_NEUTRAL = 0;
-	public static final int SUBLANG_NEUTRAL	= 0;
-	public static final int SUBLANG_DEFAULT	= 1;
-	public static final int SUBLANG_SYS_DEFAULT	= 2;
-
-	// MANIFEST
-	public static final int MANIFEST = 1;
-
-	// ICON
-	public static final int APP_ICON = 1;
-
-	// BITMAP
-	public static final int SPLASH_BITMAP = 1;
-
-	// RCDATA
-	public static final int JRE_PATH = 1;
-	public static final int JAVA_MIN_VER = 2;
-	public static final int JAVA_MAX_VER = 3;
-	public static final int SHOW_SPLASH = 4;
-	public static final int SPLASH_WAITS_FOR_WINDOW = 5;
-	public static final int SPLASH_TIMEOUT = 6;
-	public static final int SPLASH_TIMEOUT_ERR = 7;
-	public static final int CHDIR = 8;
-	public static final int ERR_TITLE = 10;
-	public static final int GUI_HEADER_STAYS_ALIVE = 11;
-	public static final int JVM_OPTIONS = 12;
-	public static final int CMD_LINE = 13;
-	public static final int JAR = 14;
-	public static final int MAIN_CLASS = 15;
-	public static final int CLASSPATH = 16;
-	public static final int WRAPPER = 17;
-	public static final int JDK_PREFERENCE = 18;
-	public static final int ENV_VARIABLES = 19;
-	public static final int PRIORITY_CLASS = 20;
-	public static final int	DOWNLOAD_URL = 	21;
-	public static final int SUPPORT_URL = 22;
-	public static final int MUTEX_NAME = 23;
-	public static final int INSTANCE_WINDOW_TITLE = 24;
-	public static final int INITIAL_HEAP_SIZE = 25;
-	public static final int INITIAL_HEAP_PERCENT = 26;
-	public static final int MAX_HEAP_SIZE = 27;
-	public static final int MAX_HEAP_PERCENT = 28;
-	public static final int BUNDLED_JRE_64_BIT = 29;
-	public static final int RUNTIME_BITS = 30;
-	public static final int RESTART_ON_CRASH = 31;
-	public static final int BUNDLED_JRE_AS_FALLBACK	= 32;
-
-	public static final int STARTUP_ERR = 101;
-	public static final int BUNDLED_JRE_ERR = 102;
-	public static final int JRE_VERSION_ERR = 103;
-	public static final int LAUNCHER_ERR = 104;
-	public static final int INSTANCE_ALREADY_EXISTS_MSG = 105;
-
-	private final StringBuffer _sb = new StringBuffer();
-
-	public String getContent() {
-		return _sb.toString();
-	}
-
-	public String getLine(int line) {
-		return _sb.toString().split("\n")[line - 1];
-	}
-
-	public File build(Config c) throws IOException {
-		_sb.append("LANGUAGE ");
-		_sb.append(LANG_NEUTRAL);
-		_sb.append(", ");
-		_sb.append(SUBLANG_DEFAULT);
-		_sb.append('\n');
-		addVersionInfo(c.getVersionInfo());
-		addJre(c.getJre());
-		addManifest(MANIFEST, c.getManifest());
-		addIcon(APP_ICON, c.getIcon());
-		addText(ERR_TITLE, c.getErrTitle());
-		addText(DOWNLOAD_URL, c.getDownloadUrl());
-		addText(SUPPORT_URL, c.getSupportUrl());
-		addText(CMD_LINE, c.getCmdLine());
-		addWindowsPath(CHDIR, c.getChdir());
-		addText(PRIORITY_CLASS, String.valueOf(c.getPriorityClass()));
-		addTrue(GUI_HEADER_STAYS_ALIVE, c.isStayAlive());
-		addTrue(RESTART_ON_CRASH, c.isRestartOnCrash());
-		addSplash(c.getSplash());
-		addMessages(c);
-
-		if (c.getSingleInstance() != null) {
-			addText(MUTEX_NAME, c.getSingleInstance().getMutexName());
-			addText(INSTANCE_WINDOW_TITLE, c.getSingleInstance().getWindowTitle());
-		}
-
-		if (c.getVariables() != null && !c.getVariables().isEmpty()) {
-			StringBuffer vars = new StringBuffer();
-			append(vars, c.getVariables(), "\t");
-			addText(ENV_VARIABLES, vars.toString());
-		}
-
-		// MAIN_CLASS / JAR
-		addTrue(WRAPPER, !c.isDontWrapJar());
-
-		if (c.getClassPath() != null) {
-			addText(MAIN_CLASS, c.getClassPath().getMainClass());
-			addWindowsPath(CLASSPATH, c.getClassPath().getPathsString());
-		}
-
-		if (c.isDontWrapJar() && c.getJar() != null) {
-			addWindowsPath(JAR, c.getJar().getPath());
-		}
-		
-		File file = Util.createTempFile("rc");
-
-		if ("MS932".equals(System.getProperty("file.encoding"))) {
-			writeKanjiResourceFile(file);
-		} else {
-			writeResourceFile(file);
-		}
-
-		return file;
-	}
-	
-	private void writeResourceFile(File file) throws IOException {
-		BufferedWriter w = null;
-
-		try {
-			w = new BufferedWriter(new FileWriter(file));
-			w.write(_sb.toString());
-		} finally {
-			Util.close(w);
-		}
-	}
-
-	/**
-	 * Handle Japanese encoding - by toshimm.
-	 */
-	private void writeKanjiResourceFile(File file) throws IOException {
-		FileOutputStream output = null;
-		KanjiEscapeOutputStream kanji = null;
-		OutputStreamWriter writer = null;
-		BufferedWriter w = null;
-
-		try {
-			output = new FileOutputStream(file);
-			kanji = new KanjiEscapeOutputStream(output);
-			writer = new OutputStreamWriter(kanji);
-			w = new BufferedWriter(writer);
-			w.write(_sb.toString());
-		} finally {
-			Util.close(w);
-			Util.close(writer);
-			Util.close(kanji);
-			Util.close(output);
-		}
-	}
-
-	private void addVersionInfo(VersionInfo v) {
-		if (v == null) {
-			return;
-		}
-
-		_sb.append("1 VERSIONINFO\n");
-		_sb.append("FILEVERSION ");
-		_sb.append(v.getFileVersion().replaceAll("\\.", ", "));
-		_sb.append("\nPRODUCTVERSION ");
-		_sb.append(v.getProductVersion().replaceAll("\\.", ", "));
-		_sb.append("\nFILEFLAGSMASK 0\n" +
-				"FILEOS 0x40000\n" +
-				"FILETYPE 1\n" +
-				"{\n" + 
-				" BLOCK \"StringFileInfo\"\n" +
-				" {\n" +
-				"  BLOCK \"040904E4\"\n" +	// English
-				"  {\n");
-
-		addVerBlockValue("CompanyName", v.getCompanyName());
-		addVerBlockValue("FileDescription", v.getFileDescription());
-		addVerBlockValue("FileVersion", v.getTxtFileVersion());
-		addVerBlockValue("InternalName", v.getInternalName());
-		addVerBlockValue("LegalCopyright", v.getCopyright());
-		addVerBlockValue("OriginalFilename", v.getOriginalFilename());
-		addVerBlockValue("ProductName", v.getProductName());
-		addVerBlockValue("ProductVersion", v.getTxtProductVersion());
-		_sb.append("  }\n }\nBLOCK \"VarFileInfo\"\n{\nVALUE \"Translation\", 0x0409, 0x04E4\n}\n}");     
-	}
-
-	private void addJre(Jre jre) {
-		addWindowsPath(JRE_PATH, jre.getPath());
-		addTrue(BUNDLED_JRE_64_BIT, jre.getBundledJre64Bit());
-		addTrue(BUNDLED_JRE_AS_FALLBACK, jre.getBundledJreAsFallback());
-		addText(JAVA_MIN_VER, jre.getMinVersion());
-		addText(JAVA_MAX_VER, jre.getMaxVersion());
-		addText(JDK_PREFERENCE, String.valueOf(jre.getJdkPreferenceIndex()));
-
-		addInteger(RUNTIME_BITS, jre.getRuntimeBitsIndex() + 1);
-		addInteger(INITIAL_HEAP_SIZE, jre.getInitialHeapSize());
-		addInteger(INITIAL_HEAP_PERCENT, jre.getInitialHeapPercent());
-		addInteger(MAX_HEAP_SIZE, jre.getMaxHeapSize());
-		addInteger(MAX_HEAP_PERCENT, jre.getMaxHeapPercent());
-
-		StringBuffer options = new StringBuffer();
-
-		if (jre.getOptions() != null && !jre.getOptions().isEmpty()) {
-			addSpace(options);
-			append(options, jre.getOptions(), " ");
-		}
-
-		addText(JVM_OPTIONS, options.toString());
-	}
-	
-	private void addSplash(Splash splash) {
-		if (splash == null) {
-			return;
-		}
-
-		addTrue(SHOW_SPLASH, true);
-		addTrue(SPLASH_WAITS_FOR_WINDOW, splash.getWaitForWindow());
-		addText(SPLASH_TIMEOUT, String.valueOf(splash.getTimeout()));
-		addTrue(SPLASH_TIMEOUT_ERR, splash.isTimeoutErr());
-		addBitmap(SPLASH_BITMAP, splash.getFile());
-	}
-	
-	private void addMessages(Config c) {
-		Msg msg = c.getMessages();
-
-		if (msg == null) {
-			msg = new Msg();
-		}
-
-		addText(STARTUP_ERR, msg.getStartupErr());
-		addText(BUNDLED_JRE_ERR, msg.getBundledJreErr());
-		addText(JRE_VERSION_ERR, msg.getJreVersionErr());
-		addText(LAUNCHER_ERR, msg.getLauncherErr());
-
-		if (c.getSingleInstance() != null) {
-			addText(INSTANCE_ALREADY_EXISTS_MSG, msg.getInstanceAlreadyExistsMsg());
-		}
-	}
-
-	private void append(StringBuffer sb, List<String> list, String separator) {
-		for (int i = 0; i < list.size(); i++) {
-			sb.append(list.get(i));
-
-			if (i < list.size() - 1) {
-				sb.append(separator);
-			}
-		}
-	}
-
-	private void addText(int id, String text) {
-		if (text == null || text.equals("")) {
-			return;
-		}
-
-		_sb.append(id);
-		_sb.append(" RCDATA BEGIN \"");
-		_sb.append(escape(text));
-		_sb.append("\\0\" END\n");
-	}
-
-	private void addTrue(int id, boolean value) {
-		if (value) {
-			addText(id, "true");
-		}
-	}
-
-	private void addInteger(int id, Integer value) {
-		if (value != null) {
-			addText(id, value.toString());
-		}
-	}
-
-	/**
-	 * Stores path in Windows format with '\' separators. 
-	 */
-	private void addWindowsPath(int id, String path) {
-		if (path == null || path.equals("")) {
-			return;
-		}
-
-		_sb.append(id);
-		_sb.append(" RCDATA BEGIN \"");
-		_sb.append(path.replaceAll("\\\\", "\\\\\\\\")
-				.replaceAll("/", "\\\\\\\\"));
-		_sb.append("\\0\" END\n");
-	}
-
-	private void addManifest(int id, File manifest) {
-		if (manifest == null || manifest.getPath().equals("")) {
-			return;
-		}
-
-		_sb.append(id);
-		_sb.append(" 24 \"");
-		_sb.append(getPath(Util.getAbsoluteFile(
-				ConfigPersister.getInstance().getConfigPath(), manifest)));
-		_sb.append("\"\n");
-	}
-
-	private void addIcon(int id, File icon) {
-		if (icon == null || icon.getPath().equals("")) {
-			return;
-		}
-
-		_sb.append(id);
-		_sb.append(" ICON DISCARDABLE \"");
-		_sb.append(getPath(Util.getAbsoluteFile(
-				ConfigPersister.getInstance().getConfigPath(), icon)));
-		_sb.append("\"\n");
-	}
-
-	private void addBitmap(int id, File bitmap) {
-		if (bitmap == null) {
-			return;
-		}
-
-		_sb.append(id);
-		_sb.append(" BITMAP \"");
-		_sb.append(getPath(Util.getAbsoluteFile(
-				ConfigPersister.getInstance().getConfigPath(), bitmap)));
-		_sb.append("\"\n");
-	}
-	
-	private String getPath(File f) {
-		return f.getPath().replaceAll("\\\\", "\\\\\\\\");
-	}
-	
-	private void addSpace(StringBuffer sb) {
-		int len = sb.length();
-
-		if (len-- > 0 && sb.charAt(len) != ' ') {
-			sb.append(' ');
-		}
-	}
-	
-	private void addVerBlockValue(String key, String value) {
-		_sb.append("   VALUE \"");
-		_sb.append(key);
-		_sb.append("\", \"");
-
-		if (value != null) {
-			_sb.append(escape(value));
-		}
-
-		_sb.append("\"\n");
-	}
-
-	private String escape(String text) {
-		return text.replace("\"", "\"\"")
-				.replace("\\", "\\\\")
-				.replace("\n", "\\r\\n");
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Util.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/Util.java
deleted file mode 100644
index b1006b8..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/Util.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on 2005-04-24
- */
-package net.sf.launch4j;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Util {
-	public static final boolean WINDOWS_OS = System.getProperty("os.name")
-			.toLowerCase().startsWith("windows");
-	
-	private static final String Launch4jProperties = "launch4j.properties";
-
-	private Util() {}
-	
-	public static Properties getProperties() throws IOException {
-		Properties props = new Properties();
-		InputStream in = Main.class.getClassLoader().getResourceAsStream(Launch4jProperties);
-		props.load(in);
-		in.close();
-		return props;
-	}
-
-	public static File createTempFile(String suffix) throws IOException {
-		String tmpdir = System.getProperty("launch4j.tmpdir");
-		if (tmpdir != null) {
-			if (tmpdir.indexOf(' ') != -1) {
-				throw new IOException(Messages.getString("Util.tmpdir"));
-			}
-			return File.createTempFile("launch4j", suffix, new File(tmpdir));
-		} else {
-			return File.createTempFile("launch4j", suffix);
-		}
-	}
-
-	public static File getJarBasedir() {
-		try {
-			URI uri = new URI(Util.class.getClassLoader()
-					.getResource(Launch4jProperties)
-					.getFile());
-
-			String path = uri.getPath();
-
-			if (path.startsWith("/") && path.contains("!")) {
-				// jar file
-				String jarPath = path.substring(0, path.lastIndexOf('!'));
-				String basedir = jarPath.substring(0, jarPath.lastIndexOf('/') + 1);
-				return new File(basedir);
-			} else {
-				// class files - launch4j development
-				return new File(".");
-			}
-		} catch (URISyntaxException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public static File getAbsoluteFile(File basepath, File f) {
-		return f.isAbsolute() ? f : new File(basepath, f.getPath());
-	}
-
-	public static String getExtension(File f) {
-		String name = f.getName();
-		int x = name.lastIndexOf('.');
-		if (x != -1) {
-			return name.substring(x);
-		} else {
-			return "";
-		}
-	}
-
-	public static void exec(String[] cmd, Log log) throws ExecException {
-		BufferedReader is = null;
-		try {
-			if (WINDOWS_OS) {
-				for (int i = 0; i < cmd.length; i++) {
-					cmd[i] = cmd[i].replaceAll("/", "\\\\");
-				}
-			}
-			Process p = Runtime.getRuntime().exec(cmd);
-			is = new BufferedReader(new InputStreamReader(p.getErrorStream()));
-			String line;
-			int errLine = -1;
-			Pattern pattern = Pattern.compile(":\\d+:");
-			while ((line = is.readLine()) != null) {
-				log.append(line);
-				Matcher matcher = pattern.matcher(line);
-				if (matcher.find()) {
-					errLine = Integer.valueOf(
-							line.substring(matcher.start() + 1, matcher.end() - 1))
-							.intValue();
-					break;
-				}
-			}
-			is.close();
-			p.waitFor();
-			if (errLine != -1) {
-				StringBuffer sb = new StringBuffer(Messages.getString("Util.exec.failed"));
-				AppendCommandLine(sb, cmd);
-				throw new ExecException(sb.toString(), errLine);
-			}
-			if (p.exitValue() != 0) {
-				StringBuffer sb = new StringBuffer(Messages.getString("Util.exec.failed"));
-				sb.append(" (");
-				sb.append(p.exitValue());
-				sb.append(')');
-				AppendCommandLine(sb, cmd);
-				throw new ExecException(sb.toString());
-			}
-		} catch (IOException e) {
-			close(is);
-			throw new ExecException(e);
-		} catch (InterruptedException e) {
-			close(is);
-			throw new ExecException(e);
-		}
-	}
-	
-	private static void AppendCommandLine(StringBuffer sb, String[] cmd) {
-		sb.append(": ");
-		for (int i = 0; i < cmd.length; i++) {
-			sb.append(cmd[i]);
-			if (i < cmd.length - 1) {
-				sb.append(' ');
-			}
-		}
-	}
-
-	public static void close(final InputStream o) {
-		if (o != null) {
-			try {
-				o.close();
-			} catch (IOException e) {
-				System.err.println(e); // XXX log
-			}
-		}
-	}
-
-	public static void close(final OutputStream o) {
-		if (o != null) {
-			try {
-				o.close();
-			} catch (IOException e) {
-				System.err.println(e); // XXX log
-			}
-		}
-	}
-
-	public static void close(final Reader o) {
-		if (o != null) {
-			try {
-				o.close();
-			} catch (IOException e) {
-				System.err.println(e); // XXX log
-			}
-		}
-	}
-
-	public static void close(final Writer o) {
-		if (o != null) {
-			try {
-				o.close();
-			} catch (IOException e) {
-				System.err.println(e); // XXX log
-			}
-		}
-	}
-
-	public static boolean delete(File f) {
-		return (f != null) ? f.delete() : false;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntClassPath.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntClassPath.java
deleted file mode 100644
index 171a930..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntClassPath.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Jul 19, 2006
- */
-package net.sf.launch4j.ant;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.launch4j.config.ClassPath;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class AntClassPath extends ClassPath {
-	private final List<StringWrapper> wrappedPaths = new ArrayList<StringWrapper>();
-
-	public void setCp(String cp){
-		StringWrapper wrapper = new StringWrapper();
-		wrapper.addText(cp);
-		wrappedPaths.add(wrapper);
-	}
-	
-	public void addCp(StringWrapper cp) {
-		wrappedPaths.add(cp);
-	}
-
-	public void unwrap() {
-		setPaths(StringWrapper.unwrap(wrappedPaths));
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntConfig.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntConfig.java
deleted file mode 100644
index ae4ed2f..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntConfig.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 24, 2005
- */
-package net.sf.launch4j.ant;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tools.ant.BuildException;
-
-import net.sf.launch4j.config.Config;
-import net.sf.launch4j.config.Msg;
-import net.sf.launch4j.config.SingleInstance;
-import net.sf.launch4j.config.Splash;
-import net.sf.launch4j.config.VersionInfo;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class AntConfig extends Config {
-	private final List<StringWrapper> wrappedHeaderObjects = new ArrayList<StringWrapper>();
-	private final List<StringWrapper> wrappedLibs = new ArrayList<StringWrapper>();
-	private final List<StringWrapper> wrappedVariables = new ArrayList<StringWrapper>();
-
-	public void setJarPath(String path) {
-		setJar(new File(path));
-	}
-
-	public void addObj(StringWrapper obj) {
-		wrappedHeaderObjects.add(obj);
-	}
-
-	public void addLib(StringWrapper lib) {
-		wrappedLibs.add(lib);
-	}
-	
-	public void addVar(StringWrapper var) {
-		wrappedVariables.add(var);
-	}
-
-	// __________________________________________________________________________________
-
-	public void addSingleInstance(SingleInstance singleInstance) {
-		checkNull(getSingleInstance(), "singleInstance");
-		setSingleInstance(singleInstance);
-	}
-
-	public void addClassPath(AntClassPath classPath) {
-		checkNull(getClassPath(), "classPath");
-		setClassPath(classPath);
-	}
-
-	public void addJre(AntJre jre) {
-		checkNull(getJre(), "jre");
-		setJre(jre);
-	}
-
-	public void addSplash(Splash splash) {
-		checkNull(getSplash(), "splash");
-		setSplash(splash);
-	}
-
-	public void addVersionInfo(VersionInfo versionInfo) {
-		checkNull(getVersionInfo(), "versionInfo");
-		setVersionInfo(versionInfo);
-	}
-	
-	public void addMessages(Msg messages) {
-		checkNull(getMessages(), "messages");
-		setMessages(messages);
-	}
-
-	// __________________________________________________________________________________
-
-	public void unwrap() {
-		setHeaderObjects(StringWrapper.unwrap(wrappedHeaderObjects));
-		setLibs(StringWrapper.unwrap(wrappedLibs));
-		setVariables(StringWrapper.unwrap(wrappedVariables));
-
-		if (getClassPath() != null) {
-			((AntClassPath) getClassPath()).unwrap();
-		}
-
-		if (getJre() != null) {
-			((AntJre) getJre()).unwrap();
-		}
-	}
-
-	private void checkNull(Object o, String name) {
-		if (o != null) {
-			throw new BuildException(
-					Messages.getString("AntConfig.duplicate.element")
-					+ ": "
-					+ name);
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntJre.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntJre.java
deleted file mode 100644
index ee30b77..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/AntJre.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Jul 18, 2006
- */
-package net.sf.launch4j.ant;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.launch4j.config.Jre;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class AntJre extends Jre {
-	private final List<StringWrapper> wrappedOptions = new ArrayList<StringWrapper>();
-
-	public void addOpt(StringWrapper opt) {
-		wrappedOptions.add(opt);
-	}
-
-	public void unwrap() {
-		setOptions(StringWrapper.unwrap(wrappedOptions));
-	}
-
-	/**
-	 * For backwards compatibility.
-	 */
-	public void setDontUsePrivateJres(boolean dontUse) {
-		if (dontUse) {
-			setJdkPreference(JDK_PREFERENCE_JRE_ONLY);
-		}
-		else {
-			setJdkPreference(JDK_PREFERENCE_PREFER_JRE);
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/Launch4jTask.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/Launch4jTask.java
deleted file mode 100644
index 22234a1..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/Launch4jTask.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 24, 2005
- */
-package net.sf.launch4j.ant;
-
-import java.io.File;
-
-import net.sf.launch4j.Builder;
-import net.sf.launch4j.BuilderException;
-import net.sf.launch4j.Log;
-import net.sf.launch4j.config.Config;
-import net.sf.launch4j.config.ConfigPersister;
-import net.sf.launch4j.config.ConfigPersisterException;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Launch4jTask extends Task {
-	private File _configFile;
-	private AntConfig _config;
-
-	// System properties
-	private File tmpdir;		// launch4j.tmpdir
-	private File bindir;		// launch4j.bindir
-
-	// Override configFile settings
-	private File jar;
-	private File outfile;
-	private String fileVersion;
-	private String txtFileVersion;
-	private String productVersion;
-	private String txtProductVersion;
-
-	public void execute() throws BuildException {
-		try {
-			if (tmpdir != null) {
-				System.setProperty("launch4j.tmpdir", tmpdir.getPath());
-			}
-			if (bindir != null) {
-				System.setProperty("launch4j.bindir", bindir.getPath());
-			}
-			if (_configFile != null && _config != null) {
-				throw new BuildException(
-						Messages.getString("Launch4jTask.specify.config"));
-			} else if (_configFile != null) {
-				ConfigPersister.getInstance().load(_configFile);
-				Config c = ConfigPersister.getInstance().getConfig();
-				if (jar != null) {
-					c.setJar(jar);
-				}
-				if (outfile != null) {
-					c.setOutfile(outfile);
-				}
-				if (fileVersion != null) {
-					c.getVersionInfo().setFileVersion(fileVersion);
-				}
-				if (txtFileVersion != null) {
-					c.getVersionInfo().setTxtFileVersion(txtFileVersion);
-				}
-				if (productVersion != null) {
-					c.getVersionInfo().setProductVersion(productVersion);
-				}
-				if (txtProductVersion != null) {
-					c.getVersionInfo().setTxtProductVersion(txtProductVersion);
-				}
-			} else if (_config != null) {
-				_config.unwrap();
-				ConfigPersister.getInstance().setAntConfig(_config,
-						getProject().getBaseDir());
-			} else {
-				throw new BuildException(
-						Messages.getString("Launch4jTask.specify.config"));
-			}
-			final Builder b = new Builder(Log.getAntLog());
-			b.build();
-		} catch (ConfigPersisterException e) {
-			throw new BuildException(e);
-		} catch (BuilderException e) {
-			throw new BuildException(e);
-		}
-	}
-
-	public void setConfigFile(File configFile) {
-		_configFile = configFile;
-	}
-
-	public void addConfig(AntConfig config) {
-		_config = config;
-	}
-
-	public void setBindir(File bindir) {
-		this.bindir = bindir;
-	}
-
-	public void setTmpdir(File tmpdir) {
-		this.tmpdir = tmpdir;
-	}
-
-	public void setFileVersion(String fileVersion) {
-		this.fileVersion = fileVersion;
-	}
-
-	public void setJar(File jar) {
-		this.jar = jar;
-	}
-
-	public void setJarPath(String path) {
-		this.jar = new File(path);
-	}
-
-	public void setOutfile(File outfile) {
-		this.outfile = outfile;
-	}
-
-	public void setProductVersion(String productVersion) {
-		this.productVersion = productVersion;
-	}
-
-	public void setTxtFileVersion(String txtFileVersion) {
-		this.txtFileVersion = txtFileVersion;
-	}
-
-	public void setTxtProductVersion(String txtProductVersion) {
-		this.txtProductVersion = txtProductVersion;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/Messages.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/Messages.java
deleted file mode 100644
index 7bd5262..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/Messages.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j.ant;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "net.sf.launch4j.ant.messages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/StringWrapper.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/StringWrapper.java
deleted file mode 100644
index 70ab715..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/StringWrapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Jul 18, 2006
- */
-package net.sf.launch4j.ant;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class StringWrapper {
-	private String text;
-
-	public static List<String> unwrap(List<StringWrapper> wrappers) {
-		if (wrappers.isEmpty()) {
-			return null;
-		}
-
-		List<String> strings = new ArrayList<String>(wrappers.size());
-
-		for (StringWrapper w : wrappers) {
-			strings.add(w.toString());
-		}
-
-		return strings;
-	}
-
-	public void addText(String text) {
-		this.text = text;
-	}
-
-	public String toString() {
-		return text;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/messages.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/messages.properties
deleted file mode 100644
index b78a6f8..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/messages.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2015 Grzegorz Kowal
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-Launch4jTask.specify.config=Specify configFile or config
-AntConfig.duplicate.element=Duplicate element
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/messages_es.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/messages_es.properties
deleted file mode 100644
index a48d4a8..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/ant/messages_es.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2007 Grzegorz Kowal, Patricio Mart�nez Ros
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-Launch4jTask.specify.config=Specify configFile or config
-AntConfig.duplicate.element=Duplicate element
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Binding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Binding.java
deleted file mode 100644
index e4202dd..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Binding.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 30, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public interface Binding {
-	/** Used to mark components with invalid data. */
-	public final static Color INVALID_COLOR = Color.PINK;
-
-	/** Java Bean property bound to a component */
-	public String getProperty();
-	/** Clear component, set it to the default value */ 
-	public void clear(IValidatable bean);
-	/** Java Bean property -> Component */
-	public void put(IValidatable bean);
-	/** Component -> Java Bean property */
-	public void get(IValidatable bean);
-	/** Mark component as valid */
-	public void markValid();
-	/** Mark component as invalid */
-	public void markInvalid();
-	/** Enable or disable the component */
-	public void setEnabled(boolean enabled);
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/BindingException.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/BindingException.java
deleted file mode 100644
index 868a1df..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/BindingException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 30, 2005
- */
-package net.sf.launch4j.binding;
-
-/**
- * Signals a runtime error, a missing property in a Java Bean for example.
- * 
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class BindingException extends RuntimeException {
-	public BindingException(Throwable t) {
-		super(t);
-	}
-	
-	public BindingException(String msg) {
-		super(msg);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Bindings.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Bindings.java
deleted file mode 100644
index 29ddb7f..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Bindings.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 30, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.JRadioButton;
-import javax.swing.JTextArea;
-import javax.swing.JToggleButton;
-import javax.swing.text.JTextComponent;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * Creates and handles bindings.
- * 
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Bindings implements PropertyChangeListener, ActionListener {
-	private final Map<String, Binding> _bindings = new HashMap<String, Binding>();
-	private final Map<String, Binding> _optComponents = new HashMap<String, Binding>();
-	private boolean _modified = false;
-
-	/**
-	 * Used to track component modifications.
-	 */
-	@Override
-	public void propertyChange(PropertyChangeEvent evt) {
-		String prop = evt.getPropertyName();
-		if ("AccessibleValue".equals(prop)
-				|| "AccessibleText".equals(prop)
-				|| ("AccessibleVisibleData".equals(prop)
-						&& evt.getSource().getClass().getName().contains("JList"))) {
-			_modified = true;
-		}
-	}
-	
-	@Override
-	public void actionPerformed(ActionEvent e) {
-		_modified = true;
-	}
-
-	/** 
-	 * Any of the components modified?
-	 */
-	public boolean isModified() {
-		return _modified;
-	}
-
-	public Binding getBinding(String property) {
-		return _bindings.get(property);
-	}
-
-	private void registerPropertyChangeListener(JComponent c) {
-		c.getAccessibleContext().addPropertyChangeListener(this);
-	}
-
-	private void registerPropertyChangeListener(JComponent[] components) {
-		for (JComponent c : components) {
-			c.getAccessibleContext().addPropertyChangeListener(this);
-		}
-	}
-
-	private boolean isPropertyNull(IValidatable bean, Binding b) {
-		try {
-			for (String property : _optComponents.keySet()) {
-				if (b.getProperty().startsWith(property)) {
-					return PropertyUtils.getProperty(bean, property) == null;
-				}
-			}
-
-			return false;
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	/**
-	 * Enables or disables all components bound to properties that begin with given prefix.
-	 */
-	public void setComponentsEnabled(String prefix, boolean enabled) {
-		for (Binding b : _bindings.values()) {
-			if (b.getProperty().startsWith(prefix)) {
-				b.setEnabled(enabled);
-			}
-		}
-	}
-
-	/**
-	 * Clear all components, set them to their default values.
-	 * Clears the _modified flag.
-	 */
-	public void clear(IValidatable bean) {
-		for (Binding b : _optComponents.values()) {
-			b.clear(bean);
-		}
-
-		for (Binding b : _bindings.values()) {
-			b.clear(bean);
-		}
-
-		_modified = false;
-	}
-
-	/**
-	 * Copies data from the Java Bean to the UI components.
-	 * Clears the _modified flag.
-	 */
-	public void put(IValidatable bean) {
-		for (Binding b : _optComponents.values()) {
-			b.put(bean);
-		}
-
-		for (Binding b : _bindings.values()) {
-			if (isPropertyNull(bean, b)) {
-				b.clear(null);
-			} else {
-				b.put(bean);
-			}
-		}
-
-		_modified = false;
-	}
-
-	/**
-	 * Copies data from UI components to the Java Bean and checks it's class invariants.
-	 * Clears the _modified flag.
-	 * @throws InvariantViolationException
-	 * @throws BindingException
-	 */
-	public void get(IValidatable bean) {
-		try {
-			for (Binding b : _optComponents.values()) {
-				b.get(bean);
-			}
-
-			for (Binding b : _bindings.values()) {
-				if (!isPropertyNull(bean, b)) {
-					b.get(bean);
-				}
-			}
-
-			bean.checkInvariants();
-			
-			for (String property : _optComponents.keySet()) {
-				IValidatable component = (IValidatable) PropertyUtils.getProperty(bean,
-						property);
-
-				if (component != null) {
-					component.checkInvariants();
-				}
-			}
-
-			_modified = false;	// XXX
-		} catch (InvariantViolationException e) {
-			e.setBinding(getBinding(e.getProperty()));
-			throw e;
-		} catch (Exception e) {
-			throw new BindingException(e);
-		} 
-	}
-
-	private Bindings add(Binding b) {
-		if (_bindings.containsKey(b.getProperty())) {
-			throw new BindingException(Messages.getString("Bindings.duplicate.binding"));
-		}
-
-		_bindings.put(b.getProperty(), b);
-		return this;
-	}
-
-	/**
-	 * Add an optional (nullable) Java Bean component of type clazz.
-	 */
-	public Bindings addOptComponent(String property, Class<? extends IValidatable> clazz, JToggleButton c,
-			boolean enabledByDefault) {
-		Binding b = new OptComponentBinding(this, property, clazz, c, enabledByDefault);
-
-		if (_optComponents.containsKey(property)) {
-			throw new BindingException(Messages.getString("Bindings.duplicate.binding"));
-		}
-
-		_optComponents.put(property, b);
-		return this;
-	}
-
-	/**
-	 * Add an optional (nullable) Java Bean component of type clazz.
-	 */
-	public Bindings addOptComponent(String property, Class<? extends IValidatable> clazz, JToggleButton c) {
-		return addOptComponent(property, clazz, c, false);
-	}
-
-	/**
-	 * Handles JEditorPane, JTextArea, JTextField
-	 */
-	public Bindings add(String property, JTextComponent c, String defaultValue) {
-		registerPropertyChangeListener(c);
-		return add(new JTextComponentBinding(property, c, defaultValue));
-	}
-
-	/**
-	 * Handles JEditorPane, JTextArea, JTextField
-	 */
-	public Bindings add(String property, JTextComponent c) {
-		registerPropertyChangeListener(c);
-		return add(new JTextComponentBinding(property, c, ""));
-	}
-
-	/**
-	 * Handles JToggleButton, JCheckBox 
-	 */
-	public Bindings add(String property, JToggleButton c, boolean defaultValue) {
-		registerPropertyChangeListener(c);
-		return add(new JToggleButtonBinding(property, c, defaultValue));
-	}
-
-	/**
-	 * Handles JToggleButton, JCheckBox
-	 */
-	public Bindings add(String property, JToggleButton c) {
-		registerPropertyChangeListener(c);
-		return add(new JToggleButtonBinding(property, c, false));
-	}
-
-	/**
-	 * Handles JRadioButton
-	 */
-	public Bindings add(String property, JRadioButton[] cs, int defaultValue) {
-		registerPropertyChangeListener(cs);
-		return add(new JRadioButtonBinding(property, cs, defaultValue));
-	}
-	
-	/**
-	 * Handles JRadioButton
-	 */
-	public Bindings add(String property, JRadioButton[] cs) {
-		registerPropertyChangeListener(cs);
-		return add(new JRadioButtonBinding(property, cs, 0));
-	}
-
-	/**
-	 * Handles JTextArea
-	 */
-	public Bindings add(String property, JTextArea textArea, String defaultValue) {
-		registerPropertyChangeListener(textArea);
-		return add(new JTextComponentBinding(property, textArea, defaultValue));
-	}
-
-	/**
-	 * Handles JTextArea lists
-	 */
-	public Bindings add(String property, JTextArea textArea) {
-		registerPropertyChangeListener(textArea);
-		return add(new JTextAreaBinding(property, textArea));
-	}
-
-	/**
-	 * Handles Optional JTextArea lists
-	 */
-	public Bindings add(String property, String stateProperty, 
-			JToggleButton button, JTextArea textArea) {
-		registerPropertyChangeListener(button);
-		registerPropertyChangeListener(textArea);
-		return add(new OptJTextAreaBinding(property, stateProperty, button, textArea));
-	}
-
-	/**
-	 * Handles JList
-	 */
-	public Bindings add(String property, JList list) {
-		registerPropertyChangeListener(list);
-		return add(new JListBinding(property, list));
-	}
-
-	/**
-	 * Handles JComboBox
-	 */
-	public Bindings add(String property, JComboBox combo, int defaultValue) {
-		combo.addActionListener(this);
-		return add(new JComboBoxBinding(property, combo, defaultValue));
-	}
-
-	/**
-	 * Handles JComboBox
-	 */
-	public Bindings add(String property, JComboBox combo) {
-		combo.addActionListener(this);
-		return add(new JComboBoxBinding(property, combo, 0));
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/IValidatable.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/IValidatable.java
deleted file mode 100644
index 4865967..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/IValidatable.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on 2004-01-30
- */
-package net.sf.launch4j.binding;
-
-/**
- * @author Copyright (C) 2004 Grzegorz Kowal
- */
-public interface IValidatable {
-	public void checkInvariants();
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/InvariantViolationException.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/InvariantViolationException.java
deleted file mode 100644
index 67db27b..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/InvariantViolationException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Jun 23, 2003
- */
-package net.sf.launch4j.binding;
-
-/**
- * @author Copyright (C) 2003 Grzegorz Kowal
- */
-public class InvariantViolationException extends RuntimeException {
-	private final String _property;
-	private Binding _binding;
-
-	public InvariantViolationException(String msg) {
-		super(msg);
-		_property = null;
-	}
-
-	public InvariantViolationException(String property, String msg) {
-		super(msg);
-		_property = property;
-	}
-	
-	public String getProperty() {
-		return _property;
-	}
-	
-	public Binding getBinding() {
-		return _binding;
-	}
-
-	public void setBinding(Binding binding) {
-		_binding = binding;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JComboBoxBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JComboBoxBinding.java
deleted file mode 100644
index a3f611e..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JComboBoxBinding.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2007 Ian Roberts
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 10, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-
-import javax.swing.JComboBox;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * @author Copyright (C) 2007 Ian Roberts
- */
-public class JComboBoxBinding implements Binding {
-	private final String _property;
-	private final JComboBox _combo;
-	private final int _defaultValue;
-	private final Color _validColor;
-
-	public JComboBoxBinding(String property, JComboBox combo, int defaultValue) {
-		if (property == null || combo == null) {
-			throw new NullPointerException();
-		}
-		if (property.equals("")
-				|| combo.getItemCount() == 0
-				|| defaultValue < 0 || defaultValue >= combo.getItemCount()) {
-			throw new IllegalArgumentException();
-		}
-		_property = property;
-		_combo = combo;
-		_defaultValue = defaultValue;
-		_validColor = combo.getBackground();
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		select(_defaultValue);
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			Integer i = (Integer) PropertyUtils.getProperty(bean, _property);
-			if (i == null) {
-				throw new BindingException(
-						Messages.getString("JComboBoxBinding.property.null"));
-			}
-			select(i.intValue());
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			PropertyUtils.setProperty(bean, _property, new Integer(_combo.getSelectedIndex()));
-			return;
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	private void select(int index) {
-		if (index < 0 || index >= _combo.getItemCount()) {
-			throw new BindingException(
-					Messages.getString("JComboBoxBinding.index.out.of.bounds"));
-		}
-		_combo.setSelectedIndex(index);
-	}
-
-	public void markValid() {
-		_combo.setBackground(_validColor);
-		_combo.requestFocusInWindow();
-	}
-
-	public void markInvalid() {
-		_combo.setBackground(Binding.INVALID_COLOR);
-	}
-	
-	public void setEnabled(boolean enabled) {
-		_combo.setEnabled(enabled);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JListBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JListBinding.java
deleted file mode 100644
index 060f89f..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JListBinding.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.DefaultListModel;
-import javax.swing.JList;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class JListBinding implements Binding {
-	private final String _property;
-	private final JList _list;
-	private final Color _validColor;
-
-	public JListBinding(String property, JList list) {
-		if (property == null || list == null) {
-			throw new NullPointerException();
-		}
-		if (property.equals("")) {
-			throw new IllegalArgumentException();
-		}
-		_property = property;
-		_list = list;
-		_validColor = _list.getBackground();
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		_list.setModel(new DefaultListModel());
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			DefaultListModel model = new DefaultListModel();
-			List<?> list = (List<?>) PropertyUtils.getProperty(bean, _property);
-
-			if (list != null) {
-				for (Object o : list) {
-					model.addElement(o);
-				}
-			}
-
-			_list.setModel(model);
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			DefaultListModel model = (DefaultListModel) _list.getModel();
-			final int size = model.getSize();
-			List<Object> list = new ArrayList<Object>(size);
-
-			for (int i = 0; i < size; i++) {
-				list.add(model.get(i));
-			}
-
-			PropertyUtils.setProperty(bean, _property, list);
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-	
-	public void markValid() {
-		_list.setBackground(_validColor);
-		_list.requestFocusInWindow();
-	}
-
-	public void markInvalid() {
-		_list.setBackground(Binding.INVALID_COLOR);
-	}
-	
-	public void setEnabled(boolean enabled) {
-		_list.setEnabled(enabled);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JRadioButtonBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JRadioButtonBinding.java
deleted file mode 100644
index 345f802..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JRadioButtonBinding.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 10, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-
-import javax.swing.JRadioButton;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class JRadioButtonBinding implements Binding {
-	private final String _property;
-	private final JRadioButton[] _buttons;
-	private final int _defaultValue;
-	private final Color _validColor;
-
-	public JRadioButtonBinding(String property, JRadioButton[] buttons, int defaultValue) {
-		if (property == null || buttons == null) {
-			throw new NullPointerException();
-		}
-		for (int i = 0; i < buttons.length; i++) {
-			if (buttons[i] == null) {
-				throw new NullPointerException();
-			}
-		}
-		if (property.equals("")
-				|| buttons.length == 0
-				|| defaultValue < 0 || defaultValue >= buttons.length) {
-			throw new IllegalArgumentException();
-		}
-		_property = property;
-		_buttons = buttons;
-		_defaultValue = defaultValue;
-		_validColor = buttons[0].getBackground();
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		select(_defaultValue);
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			Integer i = (Integer) PropertyUtils.getProperty(bean, _property);
-			if (i == null) {
-				throw new BindingException(
-						Messages.getString("JRadioButtonBinding.property.null"));
-			}
-			select(i.intValue());
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			for (int i = 0; i < _buttons.length; i++) {
-				if (_buttons[i].isSelected()) {
-					PropertyUtils.setProperty(bean, _property, new Integer(i));
-					return;
-				}
-			}
-			throw new BindingException(
-					Messages.getString("JRadioButtonBinding.nothing.selected"));
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	private void select(int index) {
-		if (index < 0 || index >= _buttons.length) {
-			throw new BindingException(
-					Messages.getString("JRadioButtonBinding.index.out.of.bounds"));
-		}
-		_buttons[index].setSelected(true);
-	}
-
-	public void markValid() {
-		for (int i = 0; i < _buttons.length; i++) {
-			if (_buttons[i].isSelected()) {
-				_buttons[i].setBackground(_validColor);
-				_buttons[i].requestFocusInWindow();
-				return;
-			}
-		}
-		throw new BindingException(
-				Messages.getString("JRadioButtonBinding.nothing.selected"));
-	}
-
-	public void markInvalid() {
-		for (int i = 0; i < _buttons.length; i++) {
-			if (_buttons[i].isSelected()) {
-				_buttons[i].setBackground(Binding.INVALID_COLOR);
-				return;
-			}
-		}
-		throw new BindingException(
-				Messages.getString("JRadioButtonBinding.nothing.selected"));
-	}
-	
-	public void setEnabled(boolean enabled) {
-		for (int i = 0; i < _buttons.length; i++) {
-			_buttons[i].setEnabled(enabled);
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JTextAreaBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JTextAreaBinding.java
deleted file mode 100644
index e018797..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JTextAreaBinding.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Jun 14, 2006
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JTextArea;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class JTextAreaBinding implements Binding {
-	private final String _property;
-	private final JTextArea _textArea;
-	private final Color _validColor;
-
-	public JTextAreaBinding(String property, JTextArea textArea) {
-		if (property == null || textArea == null) {
-			throw new NullPointerException();
-		}
-		if (property.equals("")) {
-			throw new IllegalArgumentException();
-		}
-		_property = property;
-		_textArea = textArea;
-		_validColor = _textArea.getBackground();
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		put(bean);
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			List<?> list = (List<?>) PropertyUtils.getProperty(bean, _property);
-			StringBuffer sb = new StringBuffer();
-
-			if (list != null) {
-				for (int i = 0; i < list.size(); i++) {
-					sb.append(list.get(i));
-					if (i < list.size() - 1) {
-						sb.append("\n");
-					}
-				}
-			}
-
-			_textArea.setText(sb.toString());
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			String text = _textArea.getText();
-
-			if (!text.equals("")) {
-				String[] items = text.split("\n");
-				List<Object> list = new ArrayList<Object>();
-
-				for (int i = 0; i < items.length; i++) {
-					list.add(items[i]);
-				}
-
-				PropertyUtils.setProperty(bean, _property, list);
-			} else {
-				PropertyUtils.setProperty(bean, _property, null);
-			}
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void markValid() {
-		_textArea.setBackground(_validColor);
-		_textArea.requestFocusInWindow();
-	}
-
-	public void markInvalid() {
-		_textArea.setBackground(Binding.INVALID_COLOR);
-	}
-	
-	public void setEnabled(boolean enabled) {
-		_textArea.setEnabled(enabled);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JTextComponentBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JTextComponentBinding.java
deleted file mode 100644
index 0232b78..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JTextComponentBinding.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 30, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-
-import javax.swing.text.JTextComponent;
-
-import org.apache.commons.beanutils.BeanUtils;
-
-/**
- * Handles JEditorPane, JTextArea, JTextField
- * 
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class JTextComponentBinding implements Binding {
-	private final String _property;
-	private final JTextComponent _textComponent;
-	private final String _defaultValue;
-	private final Color _validColor;
-
-	public JTextComponentBinding(String property, JTextComponent textComponent,
-			String defaultValue) {
-		if (property == null || textComponent == null || defaultValue == null) {
-			throw new NullPointerException();
-		}
-		if (property.equals("")) {
-			throw new IllegalArgumentException();
-		}
-		_property = property;
-		_textComponent = textComponent;
-		_defaultValue = defaultValue;
-		_validColor = _textComponent.getBackground();
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		_textComponent.setText(_defaultValue);
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			String s = BeanUtils.getProperty(bean, _property);
-			// XXX displays zeros as blank
-			_textComponent.setText(s != null && !s.equals("0") ? s : "");
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			BeanUtils.setProperty(bean, _property, _textComponent.getText());
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-	
-	public void markValid() {
-		_textComponent.setBackground(_validColor);
-		_textComponent.requestFocusInWindow();
-	}
-
-	public void markInvalid() {
-		_textComponent.setBackground(Binding.INVALID_COLOR);
-	}
-	
-	public void setEnabled(boolean enabled) {
-		_textComponent.setEnabled(enabled);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JToggleButtonBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JToggleButtonBinding.java
deleted file mode 100644
index 9410cfc..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/JToggleButtonBinding.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 30, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-
-import javax.swing.JToggleButton;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * Handles JToggleButton, JCheckBox 
- *
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class JToggleButtonBinding implements Binding {
-	private final String _property;
-	private final JToggleButton _button;
-	private final boolean _defaultValue;
-	private final Color _validColor;
-
-	public JToggleButtonBinding(String property, JToggleButton button,
-			boolean defaultValue) {
-		if (property == null || button == null) {
-			throw new NullPointerException();
-		}
-		if (property.equals("")) {
-			throw new IllegalArgumentException();
-		}
-		_property = property;
-		_button = button;
-		_defaultValue = defaultValue;
-		_validColor = _button.getBackground();
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		_button.setSelected(_defaultValue);
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			Boolean b = (Boolean) PropertyUtils.getProperty(bean, _property);
-			_button.setSelected(b != null && b.booleanValue());
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			PropertyUtils.setProperty(bean, _property,
-					Boolean.valueOf(_button.isSelected()));
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-	
-	public void markValid() {
-		_button.setBackground(_validColor);
-		_button.requestFocusInWindow();
-	}
-
-	public void markInvalid() {
-		_button.setBackground(Binding.INVALID_COLOR);
-	}
-	
-	public void setEnabled(boolean enabled) {
-		_button.setEnabled(enabled);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Messages.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Messages.java
deleted file mode 100644
index 7bd0aa4..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Messages.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j.binding;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "net.sf.launch4j.binding.messages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-	private static final MessageFormat FORMATTER = new MessageFormat("");
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-	
-	public static String getString(String key, String arg0) {
-		return getString(key, new Object[] {arg0});
-	}
-
-	public static String getString(String key, String arg0, String arg1) {
-		return getString(key, new Object[] {arg0, arg1});
-	}
-
-	public static String getString(String key, String arg0, String arg1, String arg2) {
-		return getString(key, new Object[] {arg0, arg1, arg2});
-	}
-
-	public static String getString(String key, Object[] args) {
-		try {
-			FORMATTER.applyPattern(RESOURCE_BUNDLE.getString(key));
-			return FORMATTER.format(args);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/OptComponentBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/OptComponentBinding.java
deleted file mode 100644
index 8fef9a1..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/OptComponentBinding.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 11, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-
-import javax.swing.JToggleButton;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class OptComponentBinding implements Binding, ActionListener {
-	private final Bindings _bindings;
-	private final String _property;
-	private final Class<? extends IValidatable> _clazz;
-	private final JToggleButton _button;
-	private final boolean _enabledByDefault;
-
-	public OptComponentBinding(Bindings bindings, String property, Class<? extends IValidatable> clazz,
-								JToggleButton button, boolean enabledByDefault) {
-		if (property == null || clazz == null || button == null) {
-			throw new NullPointerException();
-		}
-
-		if (property.equals("")) {
-			throw new IllegalArgumentException();
-		}
-
-		if (!Arrays.asList(clazz.getInterfaces()).contains(IValidatable.class)) {
-			throw new IllegalArgumentException(
-					Messages.getString("OptComponentBinding.must.implement")
-					+ IValidatable.class);
-		}
-
-		_bindings = bindings;
-		_property = property;
-		_clazz = clazz;
-		_button = button;
-		_button.addActionListener(this);
-		_enabledByDefault = enabledByDefault;
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		_button.setSelected(_enabledByDefault);
-		updateComponents();
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			Object component = PropertyUtils.getProperty(bean, _property);
-			_button.setSelected(component != null);
-			updateComponents();
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			PropertyUtils.setProperty(bean, _property, _button.isSelected()
-					? _clazz.newInstance() : null);
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void markValid() {}
-
-	public void markInvalid() {}
-
-	public void setEnabled(boolean enabled) {} // XXX implement?
-
-	public void actionPerformed(ActionEvent e) {
-		updateComponents();
-	}
-	
-	private void updateComponents() {
-		_bindings.setComponentsEnabled(_property, _button.isSelected());
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/OptJTextAreaBinding.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/OptJTextAreaBinding.java
deleted file mode 100644
index 1fd2709..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/OptJTextAreaBinding.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Sep 3, 2005
- */
-package net.sf.launch4j.binding;
-
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JTextArea;
-import javax.swing.JToggleButton;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class OptJTextAreaBinding implements Binding, ActionListener {
-	private final String _property;
-	private final String _stateProperty;
-	private final JToggleButton _button;
-	private final JTextArea _textArea;
-	private final Color _validColor;
-
-	public OptJTextAreaBinding(String property, String stateProperty, 
-			JToggleButton button, JTextArea textArea) {
-		if (property == null || button == null || textArea == null) {
-			throw new NullPointerException();
-		}
-		if (property.equals("")) {
-			throw new IllegalArgumentException();
-		}
-		_property = property;
-		_stateProperty = stateProperty;
-		_button = button;
-		_textArea = textArea;
-		_validColor = _textArea.getBackground();
-		button.addActionListener(this);
-	}
-
-	public String getProperty() {
-		return _property;
-	}
-
-	public void clear(IValidatable bean) {
-		put(bean);
-	}
-
-	public void put(IValidatable bean) {
-		try {
-			boolean selected = "true".equals(BeanUtils.getProperty(bean,
-					_stateProperty));
-			_button.setSelected(selected);
-			_textArea.setEnabled(selected);
-			List<?> list = (List<?>) PropertyUtils.getProperty(bean, _property);
-			StringBuffer sb = new StringBuffer();
-
-			if (list != null) {
-				for (int i = 0; i < list.size(); i++) {
-					sb.append(list.get(i));
-					if (i < list.size() - 1) {
-						sb.append("\n");
-					}
-				}
-			}
-
-			_textArea.setText(sb.toString());
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void get(IValidatable bean) {
-		try {
-			String text = _textArea.getText();
-
-			if (_button.isSelected() && !text.equals("")) {
-				String[] items = text.split("\n");
-				List<Object> list = new ArrayList<Object>();
-
-				for (String s : items) {
-					list.add(s);
-				}
-
-				PropertyUtils.setProperty(bean, _property, list);
-			} else {
-				PropertyUtils.setProperty(bean, _property, null);
-			}
-		} catch (Exception e) {
-			throw new BindingException(e);
-		}
-	}
-
-	public void markValid() {
-		_textArea.setBackground(_validColor);
-		_textArea.requestFocusInWindow();
-	}
-
-	public void markInvalid() {
-		_textArea.setBackground(Binding.INVALID_COLOR);
-	}
-	
-	public void setEnabled(boolean enabled) {
-		_textArea.setEnabled(enabled);
-	}
-
-	public void actionPerformed(ActionEvent e) {
-		_textArea.setEnabled(_button.isSelected());
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Validator.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Validator.java
deleted file mode 100644
index fb2484a..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/Validator.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on 2004-01-30
- */
-package net.sf.launch4j.binding;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-import net.sf.launch4j.Util;
-import net.sf.launch4j.config.ConfigPersister;
-
-/**
- * @author Copyright (C) 2004 Grzegorz Kowal
- */
-public class Validator {
-	public static final String ALPHANUMERIC_PATTERN = "[\\w]*?";
-	public static final String ALPHA_PATTERN = "[\\w&&\\D]*?";
-	public static final String NUMERIC_PATTERN = "[\\d]*?";
-	public static final String PATH_PATTERN = "[\\w|[ .,:\\-/\\\\]]*?";
-
-	public static final int MAX_STR = 128;
-	public static final int MAX_PATH = 260;
-	public static final int MAX_BIG_STR = 8192;	// or 16384;
-	public static final int MAX_ARGS = 32767 - 2048;
-
-	private Validator() {}
-
-	public static boolean isEmpty(String s) {
-		return s == null || s.equals("");
-	}
-
-	public static void checkNotNull(Object o, String property, String name) {
-		if (o == null) {
-			signalViolation(property,
-					Messages.getString("Validator.empty.field", name));
-		}
-	}
-
-	public static void checkString(String s, int maxLength, String property,
-			String name) {
-		if (s == null || s.length() == 0) {
-			signalViolation(property,
-					Messages.getString("Validator.empty.field", name));
-		}
-		if (s.length() > maxLength) {
-			signalLengthViolation(property, name, maxLength);
-		}
-	}
-
-	public static void checkOptStrings(List<String> strings, int maxLength, int totalMaxLength,
-			String property, String name) {
-		if (strings == null) {
-			return;
-		}
-
-		int totalLength = 0;
-
-		for (String s : strings) {
-			checkString(s, maxLength, property, name);
-			totalLength += s.length();
-
-			if (totalLength > totalMaxLength) {
-				signalLengthViolation(property, name, totalMaxLength);
-			}
-		}
-	}
-
-	public static void checkString(String s, int maxLength, String pattern,
-			String property, String name) {
-		checkString(s, maxLength, property, name);
-
-		if (!s.matches(pattern)) {
-			signalViolation(property,
-					Messages.getString("Validator.invalid.data", name));
-		}
-	}
-
-	public static void checkOptStrings(List<String> strings, int maxLength, int totalMaxLength,
-			String pattern, String property, String name, String msg) {
-		if (strings == null) {
-			return;
-		}
-
-		int totalLength = 0;
-
-		for (String s : strings) {
-			checkString(s, maxLength, property, name);
-
-			if (!s.matches(pattern)) {
-				signalViolation(property, msg != null
-						? msg 
-						: Messages.getString("Validator.invalid.data", name));
-			}
-			
-			totalLength += s.length();
-			
-			if (totalLength > totalMaxLength) {
-				signalLengthViolation(property, name, totalMaxLength);
-			}
-		}
-	}
-
-	public static void checkOptString(String s, int maxLength, String property,
-			String name) {
-		if (s == null || s.length() == 0) {
-			return;
-		}
-
-		if (s.length() > maxLength) {
-			signalLengthViolation(property, name, maxLength);
-		}
-	}
-
-	public static void checkOptString(String s, int maxLength, String pattern,
-			String property, String name) {
-		if (s == null || s.length() == 0) {
-			return;
-		}
-
-		if (s.length() > maxLength) {
-			signalLengthViolation(property, name, maxLength);
-		}
-
-		if (!s.matches(pattern)) {
-			signalViolation(property,
-					Messages.getString("Validator.invalid.data", name));
-		}
-	}
-
-	public static void checkRange(int value, int min, int max,
-			String property, String name) {
-		if (value < min || value > max) {
-			signalViolation(property,
-					Messages.getString("Validator.must.be.in.range", name,
-							String.valueOf(min), String.valueOf(max)));
-		}
-	}
-
-	public static void checkRange(char value, char min, char max,
-			String property, String name) {
-		if (value < min || value > max) {
-			signalViolation(property, Messages.getString("Validator.must.be.in.range",
-					name, String.valueOf(min), String.valueOf(max)));
-		}
-	}
-
-	public static void checkMin(int value, int min, String property, String name) {
-		if (value < min) {
-			signalViolation(property,
-					Messages.getString("Validator.must.be.at.least", name,
-							String.valueOf(min)));
-		}
-	}
-
-	public static void checkIn(String s, String[] strings, String property,
-			String name) {
-		if (isEmpty(s)) {
-			signalViolation(property,
-					Messages.getString("Validator.empty.field", name));
-		}
-
-		List<String> list = Arrays.asList(strings);
-
-		if (!list.contains(s)) {
-			signalViolation(property,
-					Messages.getString("Validator.invalid.option", name, list.toString())); 
-		}
-	}
-
-	public static void checkTrue(boolean condition, String property, String msg) {
-		if (!condition) {
-			signalViolation(property, msg);
-		}
-	}
-	
-	public static void checkFalse(boolean condition, String property, String msg) {
-		if (condition) {
-			signalViolation(property, msg);
-		}
-	}
-	
-	public static void checkFile(File f, String property, String fileDescription) {
-		File cfgPath = ConfigPersister.getInstance().getConfigPath();
-		if (f == null
-				|| f.getPath().equals("")
-				|| (!f.exists() && !Util.getAbsoluteFile(cfgPath, f).exists())) {
-			signalViolation(property,
-					Messages.getString("Validator.doesnt.exist", fileDescription));
-		}
-	}
-
-	public static void checkOptFile(File f, String property, String fileDescription) {
-		if (f != null && f.getPath().length() > 0) {
-			checkFile(f, property, fileDescription);
-		}
-	}
-
-	public static void checkRelativeWinPath(String path, String property, String msg) {
-		if (path == null
-				|| path.equals("")
-				|| path.startsWith("/")
-				|| path.startsWith("\\")
-				|| path.indexOf(':') != -1) {
-			signalViolation(property, msg);
-		}
-	}
-
-	public static void signalLengthViolation(String property, String name,
-			int maxLength) {
-		signalViolation(property,
-				Messages.getString("Validator.exceeds.max.length", name,
-						String.valueOf(maxLength)));
-	}
-
-	public static void signalViolation(String property, String msg)	{
-		throw new InvariantViolationException(property, msg);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/messages.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/messages.properties
deleted file mode 100644
index e9548cd..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/messages.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2015 Grzegorz Kowal
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-OptComponentBinding.must.implement=Optional component must implement 
-
-Validator.empty.field=Enter: {0} 
-Validator.invalid.data=Invalid data: {0} 
-Validator.must.be.in.range={0} must be in range [{1}-{2}]
-Validator.must.be.at.least={0} must be at least 
-Validator.already.exists={0} already exists.
-Validator.doesnt.exist={0} doesn''t exist.
-Validator.exceeds.max.length={0} exceeds the maximum length of {1} characters.
-Validator.invalid.option={0} must be one of [{1}]
-
-Bindings.duplicate.binding=Duplicate binding
-
-JRadioButtonBinding.property.null=Property is null
-JRadioButtonBinding.nothing.selected=Nothing selected
-JRadioButtonBinding.index.out.of.bounds=Button index out of bounds
-
-JComboBoxBinding.property.null=Property is null
-JComboBoxBinding.index.out.of.bounds=Combo box index out of bounds
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/messages_es.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/messages_es.properties
deleted file mode 100644
index 52e44f2..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/binding/messages_es.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2007 Grzegorz Kowal, Patricio Mart�nez Ros
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-OptComponentBinding.must.implement=El componente opcional debe ser implementado 
-
-Validator.empty.field=Introduzca: {0} 
-Validator.invalid.data=Dato no v�lido: {0} 
-Validator.must.be.in.range={0} debe estar en el rango [{1}-{2}]
-Validator.must.be.at.least={0} deb ser al menos 
-Validator.already.exists={0} ya existe.
-Validator.doesnt.exist={0} no existe.
-Validator.exceeds.max.length={0} excede la longitud m�xima de {1} caracteres.
-Validator.invalid.option={0} must be one of [{1}]
-
-Bindings.duplicate.binding=Binding duplicado
-
-JRadioButtonBinding.property.null=La propiedad es nula
-JRadioButtonBinding.nothing.selected=Nada seleccionado
-JRadioButtonBinding.index.out.of.bounds=�ndice de bot�n fuera de l�mite
-JComboBoxBinding.property.null=Property is null
-JComboBoxBinding.index.out.of.bounds=Combo box index out of bounds
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ClassPath.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ClassPath.java
deleted file mode 100644
index 3b64079..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ClassPath.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.config;
-
-import java.util.List;
-
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.binding.Validator;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class ClassPath implements IValidatable {
-	private String mainClass;
-	private List<String> paths;
-
-	public void checkInvariants() {
-		Validator.checkString(mainClass, Validator.MAX_PATH, "mainClass",
-				Messages.getString("ClassPath.mainClass"));
-		Validator.checkOptStrings(paths,
-				Validator.MAX_PATH,
-				Validator.MAX_BIG_STR,
-				"paths",
-				Messages.getString("ClassPath.path"));
-	}
-
-	public String getMainClass() {
-		return mainClass;
-	}
-
-	public void setMainClass(String mainClass) {
-		this.mainClass = mainClass;
-	}
-
-	public List<String> getPaths() {
-		return paths;
-	}
-
-	public void setPaths(List<String> paths) {
-		this.paths = paths;
-	}
-
-	public String getPathsString() {
-		StringBuffer sb = new StringBuffer();
-
-		if (paths != null) {
-			for (int i = 0; i < paths.size(); i++) {
-				sb.append(paths.get(i));
-	
-				if (i < paths.size() - 1) {
-					sb.append(';');
-				}
-			}
-		}
-
-		return sb.toString();
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Config.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Config.java
deleted file mode 100644
index c322831..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Config.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 21, 2005
- */
-package net.sf.launch4j.config;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.binding.Validator;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Config implements IValidatable {
-
-	// 1.x config properties_____________________________________________________________
-	public static final String HEADER = "header";
-	public static final String JAR = "jar";
-	public static final String OUTFILE = "outfile";
-	public static final String ERR_TITLE = "errTitle";
-	public static final String JAR_ARGS = "jarArgs";
-	public static final String CHDIR = "chdir";
-	public static final String STAY_ALIVE = "stayAlive";
-	public static final String ICON = "icon";
-
-	// __________________________________________________________________________________
-	public static final String DOWNLOAD_URL = "http://java.com/download";
-
-	public static final String GUI_HEADER = "gui";
-	public static final String CONSOLE_HEADER = "console";
-
-	private static final String[] HEADER_TYPES = new String[] { GUI_HEADER,
-																	CONSOLE_HEADER };
-
-	private static final String[] PRIORITY_CLASS_NAMES = new String[] { "normal",
-																		"idle",
-																		"high" };
-
-	private static final int[] PRIORITY_CLASSES = new int[] { 0x00000020,
-															0x00000040,
-															0x00000080 };
-
-	private boolean dontWrapJar;
-	private String headerType = GUI_HEADER;
-	private List<String> headerObjects;
-	private List<String> libs;
-	private File jar;
-	private File outfile;
-
-	// Runtime header configuration
-	private String errTitle;
-	private String cmdLine;
-	private String chdir;
-	private String priority;
-	private String downloadUrl;
-	private String supportUrl;
-	private boolean stayAlive;
-	private boolean restartOnCrash;
-	private File manifest;
-	private File icon;
-	private List<String> variables;
-	private SingleInstance singleInstance;
-	private ClassPath classPath;
-	private Jre jre;
-	private Splash splash;
-	private VersionInfo versionInfo;
-	private Msg	messages;
-
-	public void checkInvariants() {
-		Validator.checkTrue(outfile != null && outfile.getPath().endsWith(".exe"),
-				"outfile", Messages.getString("Config.specify.output.exe"));
-		if (dontWrapJar) {
-			if (jar != null && !jar.getPath().equals("")) {
-				Validator.checkRelativeWinPath(jar.getPath(), "jar",
-						Messages.getString("Config.application.jar.path"));
-			} else {
-				Validator.checkTrue(classPath != null, "classPath",
-						Messages.getString("ClassPath.or.jar"));
-			}
-		} else {
-			Validator.checkFile(jar, "jar",
-					Messages.getString("Config.application.jar"));
-		}
-		if (!Validator.isEmpty(chdir)) {
-			Validator.checkRelativeWinPath(chdir, "chdir",
-					Messages.getString("Config.chdir.relative"));
-			Validator.checkFalse(chdir.toLowerCase().equals("true")	
-					|| chdir.toLowerCase().equals("false"),
-					"chdir", Messages.getString("Config.chdir.path"));
-		}
-		Validator.checkOptFile(manifest, "manifest", Messages.getString("Config.manifest"));
-		Validator.checkOptFile(icon, "icon", Messages.getString("Config.icon"));
-		Validator.checkOptString(cmdLine, Validator.MAX_BIG_STR, "jarArgs",
-				Messages.getString("Config.jar.arguments"));
-		Validator.checkOptString(errTitle, Validator.MAX_STR, "errTitle",
-				Messages.getString("Config.error.title"));
-		Validator.checkOptString(downloadUrl, 256,
-				"downloadUrl", Messages.getString("Config.download.url"));
-		Validator.checkOptString(supportUrl, 256,
-				"supportUrl", Messages.getString("Config.support.url"));
-		Validator.checkIn(getHeaderType(), HEADER_TYPES, "headerType",
-				Messages.getString("Config.header.type"));
-		Validator.checkFalse(getHeaderType().equals(CONSOLE_HEADER) && splash != null,
-				"headerType",
-				Messages.getString("Config.splash.not.impl.by.console.hdr"));
-		Validator.checkOptStrings(variables,
-				Validator.MAX_ARGS,
-				Validator.MAX_ARGS,
-				"[^=%\t]+=[^=\t]+",
-				"variables",
-				Messages.getString("Config.variables"),
-				Messages.getString("Config.variables.err"));
-		Validator.checkIn(getPriority(), PRIORITY_CLASS_NAMES, "priority",
-				Messages.getString("Config.priority"));
-		jre.checkInvariants();
-	}
-	
-	public void validate() {
-		checkInvariants();
-		if (classPath != null) {
-			classPath.checkInvariants();
-		}
-		if (splash != null) {
-			splash.checkInvariants();
-		}
-		if (versionInfo != null) {
-			versionInfo.checkInvariants();
-		}
-	}
-
-	/** Change current directory to EXE location. */
-	public String getChdir() {
-		return chdir;
-	}
-
-	public void setChdir(String chdir) {
-		this.chdir = chdir;
-	}
-
-	/** Constant command line arguments passed to the application. */
-	public String getCmdLine() {
-		return cmdLine;
-	}
-
-	public void setCmdLine(String cmdLine) {
-		this.cmdLine = cmdLine;
-	}
-
-	/** Optional, error message box title. */
-	public String getErrTitle() {
-		return errTitle;
-	}
-
-	public void setErrTitle(String errTitle) {
-		this.errTitle = errTitle;
-	}
-
-	/** launch4j header file. */
-	public String getHeaderType() {
-		return headerType.toLowerCase();
-	}
-
-	public void setHeaderType(String headerType) {
-		this.headerType = headerType;
-	}
-
-	/** launch4j header file index - used by GUI. */
-	public int getHeaderTypeIndex() {
-		int x = Arrays.asList(HEADER_TYPES).indexOf(getHeaderType());
-		return x != -1 ? x : 0;
-	}
-
-	public void setHeaderTypeIndex(int headerTypeIndex) {
-		headerType = HEADER_TYPES[headerTypeIndex];
-	}
-
-	public boolean isCustomHeaderObjects() {
-		return headerObjects != null && !headerObjects.isEmpty();
-	}
-
-	public List<String> getHeaderObjects() {
-		return isCustomHeaderObjects() ? headerObjects
-				: getHeaderType().equals(GUI_HEADER)
-						? LdDefaults.GUI_HEADER_OBJECTS
-						: LdDefaults.CONSOLE_HEADER_OBJECTS;
-	}
-
-	public void setHeaderObjects(List<String> headerObjects) {
-		this.headerObjects = headerObjects;
-	}
-
-	public boolean isCustomLibs() {
-		return libs != null && !libs.isEmpty();
-	}
-
-	public List<String> getLibs() {
-		return isCustomLibs() ? libs : LdDefaults.LIBS;
-	}
-
-	public void setLibs(List<String> libs) {
-		this.libs = libs;
-	}
-
-	/** Wrapper's manifest for User Account Control. */ 
-	public File getManifest() {
-    	return manifest;
-    }
-
-	public void setManifest(File manifest) {
-    	this.manifest = manifest;
-    }
-
-	/** ICO file. */
-	public File getIcon() {
-		return icon;
-	}
-
-	public void setIcon(File icon) {
-		this.icon = icon;
-	}
-
-	/** Jar to wrap. */
-	public File getJar() {
-		return jar;
-	}
-
-	public void setJar(File jar) {
-		this.jar = jar;
-	}
-
-	public List<String> getVariables() {
-		return variables;
-	}
-
-	public void setVariables(List<String> variables) {
-		this.variables = variables;
-	}
-
-	public ClassPath getClassPath() {
-		return classPath;
-	}
-	
-	public void setClassPath(ClassPath classpath) {
-		this.classPath = classpath;
-	}
-
-	/** JRE configuration */
-	public Jre getJre() {
-		return jre;
-	}
-
-	public void setJre(Jre jre) {
-		this.jre = jre;
-	}
-
-	/** Output EXE file. */
-	public File getOutfile() {
-		return outfile;
-	}
-
-	public void setOutfile(File outfile) {
-		this.outfile = outfile;
-	}
-
-	/** Splash screen configuration. */
-	public Splash getSplash() {
-		return splash;
-	}
-
-	public void setSplash(Splash splash) {
-		this.splash = splash;
-	}
-
-	/** Stay alive after launching the application. */
-	public boolean isStayAlive() {
-		return stayAlive;
-	}
-
-	public void setStayAlive(boolean stayAlive) {
-		this.stayAlive = stayAlive;
-	}
-	
-	/** Restart the application after a crash (i.e. exit code other than 0) */
-	public boolean isRestartOnCrash() {
-		return restartOnCrash;
-	}
-	
-	public void setRestartOnCrash(boolean restartOnCrash) {
-		this.restartOnCrash = restartOnCrash;
-	}
-	
-	public VersionInfo getVersionInfo() {
-		return versionInfo;
-	}
-
-	public void setVersionInfo(VersionInfo versionInfo) {
-		this.versionInfo = versionInfo;
-	}
-
-	public boolean isDontWrapJar() {
-		return dontWrapJar;
-	}
-
-	public void setDontWrapJar(boolean dontWrapJar) {
-		this.dontWrapJar = dontWrapJar;
-	}
-
-	public int getPriorityIndex() {
-		int x = Arrays.asList(PRIORITY_CLASS_NAMES).indexOf(getPriority());
-		return x != -1 ? x : 0;
-	}
-	
-	public void setPriorityIndex(int x) {
-		priority = PRIORITY_CLASS_NAMES[x];
-	}
-
-	public String getPriority() {
-		return Validator.isEmpty(priority) ? PRIORITY_CLASS_NAMES[0] : priority;
-	}
-
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-	
-	public int getPriorityClass() {
-		return PRIORITY_CLASSES[getPriorityIndex()];
-	}
-	
-	public String getDownloadUrl() {
-		return downloadUrl == null ? DOWNLOAD_URL : downloadUrl;
-	}
-
-	public void setDownloadUrl(String downloadUrl) {
-		this.downloadUrl = downloadUrl;
-	}
-
-	public String getSupportUrl() {
-		return supportUrl;
-	}
-
-	public void setSupportUrl(String supportUrl) {
-		this.supportUrl = supportUrl;
-	}
-
-	public Msg getMessages() {
-		return messages;
-	}
-
-	public void setMessages(Msg messages) {
-		this.messages = messages;
-	}
-	
-	public SingleInstance getSingleInstance() {
-    	return singleInstance;
-    }
-
-	public void setSingleInstance(SingleInstance singleInstance) {
-    	this.singleInstance = singleInstance;
-    }
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ConfigPersister.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ConfigPersister.java
deleted file mode 100644
index cca274a..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ConfigPersister.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 22, 2005
- */
-package net.sf.launch4j.config;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSSerializer;
-
-import net.sf.launch4j.Util;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-
-/**
- * @author Copyright (C) 2014 Grzegorz Kowal
- */
-public class ConfigPersister {
-
-	private static final ConfigPersister _instance = new ConfigPersister();
-
-	private final XStream _xstream;
-	private Config _config;
-	private File _configPath;
-
-	private ConfigPersister() {
-		_xstream = new XStream(new DomDriver());
-    	_xstream.alias("launch4jConfig", Config.class);
-    	_xstream.alias("classPath", ClassPath.class);
-    	_xstream.alias("jre", Jre.class);
-    	_xstream.alias("splash", Splash.class);
-    	_xstream.alias("versionInfo", VersionInfo.class);
-
-    	_xstream.addImplicitCollection(Config.class, "headerObjects", "obj",
-    			String.class);
-    	_xstream.addImplicitCollection(Config.class, "libs", "lib", String.class);
-    	_xstream.addImplicitCollection(Config.class, "variables", "var", String.class);
-    	_xstream.addImplicitCollection(ClassPath.class, "paths", "cp", String.class);
-    	_xstream.addImplicitCollection(Jre.class, "options", "opt", String.class);
-	}
-
-	public static ConfigPersister getInstance() {
-		return _instance;
-	}
-	
-	public Config getConfig() {
-		return _config;
-	}
-
-	public File getConfigPath() {
-		return _configPath;
-	}
-	
-	public File getOutputPath() throws IOException {
-		if (_config.getOutfile().isAbsolute()) {
-			return _config.getOutfile().getParentFile();
-		}
-		File parent = _config.getOutfile().getParentFile();
-		return (parent != null) ? new File(_configPath, parent.getPath()) : _configPath;
-	}
-	
-	public File getOutputFile() throws IOException {
-		return _config.getOutfile().isAbsolute()
-			? _config.getOutfile()
-			: new File(getOutputPath(), _config.getOutfile().getName());
-	}
-
-	public void createBlank() {
-		_config = new Config();
-		_config.setJre(new Jre());
-		_configPath = null;
-	}
-
-	public void setAntConfig(Config c, File basedir) {
-		_config = c;
-		_configPath = basedir;
-	}
-
-	public void load(File f) throws ConfigPersisterException {
-	    try {
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			Document doc = builder.parse(f);
-
-			DOMImplementationLS domImplementation = (DOMImplementationLS) doc.getImplementation();
-		    LSSerializer lsSerializer = domImplementation.createLSSerializer();
-		    String configString = lsSerializer.writeToString(doc);
-
-	    	_config = (Config) _xstream.fromXML(convertToCurrent(configString));
-	    	setConfigPath(f);
-		} catch (Exception e) {
-			throw new ConfigPersisterException(e);
-		}
-	}
-
-	/**
-	 * Imports launch4j 1.x.x config file.
-	 */
-	public void loadVersion1(File f) throws ConfigPersisterException {
-		try {
-			Props props = new Props(f);
-			_config = new Config();
-			String header = props.getProperty(Config.HEADER);
-			_config.setHeaderType(header == null
-					|| header.toLowerCase().equals("guihead.bin") ? Config.GUI_HEADER
-															: Config.CONSOLE_HEADER);
-			_config.setJar(props.getFile(Config.JAR));
-			_config.setOutfile(props.getFile(Config.OUTFILE));
-			_config.setJre(new Jre());
-			_config.getJre().setPath(props.getProperty(Jre.PATH));
-			_config.getJre().setMinVersion(props.getProperty(Jre.MIN_VERSION));
-			_config.getJre().setMaxVersion(props.getProperty(Jre.MAX_VERSION));
-
-			String args = props.getProperty(Jre.ARGS);
-
-			if (args != null) {
-				List<String> jreOptions = new ArrayList<String>();
-				jreOptions.add(args);
-				_config.getJre().setOptions(jreOptions);
-			}
-
-			_config.setCmdLine(props.getProperty(Config.JAR_ARGS));
-			_config.setChdir("true".equals(props.getProperty(Config.CHDIR))
-					? "." : null);
-			_config.setStayAlive("true".equals(props.getProperty(Config.STAY_ALIVE)));
-			_config.setErrTitle(props.getProperty(Config.ERR_TITLE));
-			_config.setIcon(props.getFile(Config.ICON));
-
-			File splashFile = props.getFile(Splash.SPLASH_FILE);
-
-			if (splashFile != null) {
-				_config.setSplash(new Splash());
-				_config.getSplash().setFile(splashFile);
-				String waitfor = props.getProperty("waitfor");		// 1.x
-				_config.getSplash().setWaitForWindow(waitfor != null
-													&& !waitfor.equals(""));
-				String splashTimeout = props.getProperty(Splash.TIMEOUT);
-				if (splashTimeout != null) {
-					_config.getSplash().setTimeout(Integer.parseInt(splashTimeout));	
-				}
-				_config.getSplash().setTimeoutErr("true".equals(
-						props.getProperty(Splash.TIMEOUT_ERR)));
-			} else {
-				_config.setSplash(null);
-			}
-			setConfigPath(f);
-		} catch (IOException e) {
-			throw new ConfigPersisterException(e);
-		}
-	}
-
-	public void save(File f) throws ConfigPersisterException {
-		try {
-			BufferedWriter w = new BufferedWriter(
-					new OutputStreamWriter(new FileOutputStream(f), "UTF-8"));
-			w.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-	    	_xstream.toXML(_config, w);
-	    	w.close();
-	    	setConfigPath(f);
-		} catch (Exception e) {
-			throw new ConfigPersisterException(e);
-		}
-	}
-	
-	/**
-	 * Converts 2.x config to current format.
-	 */
-	private String convertToCurrent(String configString) {
-    	return configString
-    			.replaceAll("<headerType>0<", "<headerType>gui<")
-    			.replaceAll("<headerType>1<", "<headerType>console<")
-    			.replaceAll("jarArgs>", "cmdLine>")
-    			.replaceAll("<jarArgs[ ]*/>", "<cmdLine/>")
-    			.replaceAll("args>", "opt>")
-    			.replaceAll("<args[ ]*/>", "<opt/>")
-    			.replaceAll("<dontUsePrivateJres>false</dontUsePrivateJres>",
-    					"<jdkPreference>" + Jre.JDK_PREFERENCE_PREFER_JRE + "</jdkPreference>")
-    			.replaceAll("<dontUsePrivateJres>true</dontUsePrivateJres>",
-    					"<jdkPreference>" + Jre.JDK_PREFERENCE_JRE_ONLY + "</jdkPreference>")
-    			.replaceAll("<initialHeapSize>0</initialHeapSize>", "")
-    			.replaceAll("<maxHeapSize>0</maxHeapSize>", "")
-    			.replaceAll("<customProcName>.*</customProcName>", "");
-	}
-
-	private void setConfigPath(File configFile) {
-		_configPath = configFile.getAbsoluteFile().getParentFile();
-	}
-
-	private class Props {
-		final Properties _properties = new Properties();
-
-		public Props(File f) throws IOException {
-			FileInputStream is = null;
-			try {
-				is = new FileInputStream(f);
-				_properties.load(is);
-			} finally {
-				Util.close(is);
-			}
-		}
-
-		/**
-		 * Get property and remove trailing # comments.
-		 */
-		public String getProperty(String key) {
-			String p = _properties.getProperty(key);
-
-			if (p == null) {
-				return null;
-			}
-
-			int x = p.indexOf('#');
-			
-			if (x == -1) {
-				return p;
-			}
-			
-			do {
-				x--;
-			} while (x > 0 && (p.charAt(x) == ' ' || p.charAt(x) == '\t'));
-			
-			return (x == 0) ? "" : p.substring(0, x + 1);
-		}
-
-		public File getFile(String key) {
-			String value = getProperty(key);
-			return value != null ? new File(value) : null;
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ConfigPersisterException.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ConfigPersisterException.java
deleted file mode 100644
index 8a055b2..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/ConfigPersisterException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 22, 2005
- */
-package net.sf.launch4j.config;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class ConfigPersisterException extends Exception {
-
-	public ConfigPersisterException(String msg, Throwable t) {
-		super(msg, t);
-	}
-	
-	public ConfigPersisterException(Throwable t) {
-		super(t);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Jre.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Jre.java
deleted file mode 100644
index ceb2801..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Jre.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 21, 2005
- */
-package net.sf.launch4j.config;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.binding.Validator;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Jre implements IValidatable {
-
-	// 1.x config properties_____________________________________________________________
-	public static final String PATH = "jrepath";
-	public static final String MIN_VERSION = "javamin";
-	public static final String MAX_VERSION = "javamax";
-	public static final String ARGS = "jvmArgs";
-
-	// __________________________________________________________________________________
-	public static final String VERSION_PATTERN = "(\\d\\.){2}\\d(_\\d+)?";
-
-	public static final String JDK_PREFERENCE_JRE_ONLY = "jreOnly";
-	public static final String JDK_PREFERENCE_PREFER_JRE = "preferJre";
-	public static final String JDK_PREFERENCE_PREFER_JDK = "preferJdk";
-	public static final String JDK_PREFERENCE_JDK_ONLY = "jdkOnly";
-	
-	public static final String RUNTIME_BITS_64 = "64";
-	public static final String RUNTIME_BITS_64_AND_32 = "64/32";
-	public static final String RUNTIME_BITS_32_AND_64 = "32/64";
-	public static final String RUNTIME_BITS_32 = "32";
-
-	private static final String[] JDK_PREFERENCE_NAMES = new String[] {
-			JDK_PREFERENCE_JRE_ONLY,
-			JDK_PREFERENCE_PREFER_JRE,
-			JDK_PREFERENCE_PREFER_JDK,
-			JDK_PREFERENCE_JDK_ONLY };
-
-	private static final String[] RUNTIME_BITS_OPTIONS = new String[] {
-			RUNTIME_BITS_64,
-			RUNTIME_BITS_64_AND_32,
-			RUNTIME_BITS_32_AND_64,
-			RUNTIME_BITS_32	};
-
-	public static final int DEFAULT_JDK_PREFERENCE_INDEX
-			= Arrays.asList(JDK_PREFERENCE_NAMES).indexOf(JDK_PREFERENCE_PREFER_JRE);
-
-	public static final int DEFAULT_RUNTIME_BITS_INDEX
-			= Arrays.asList(RUNTIME_BITS_OPTIONS).indexOf(RUNTIME_BITS_64_AND_32);
-
-	private String path;
-	private boolean bundledJre64Bit;
-	private boolean bundledJreAsFallback;
-	private String minVersion;
-	private String maxVersion;
-	private String jdkPreference;
-	private String runtimeBits;
-	private Integer initialHeapSize;
-	private Integer initialHeapPercent;
-	private Integer maxHeapSize;
-	private Integer maxHeapPercent;
-	private List<String> options;
-
-	public void checkInvariants() {
-		Validator.checkOptString(minVersion, 10, VERSION_PATTERN,
-				"jre.minVersion", Messages.getString("Jre.min.version"));
-		Validator.checkOptString(maxVersion, 10, VERSION_PATTERN,
-				"jre.maxVersion", Messages.getString("Jre.max.version"));
-		if (Validator.isEmpty(path)) {
-			Validator.checkFalse(bundledJre64Bit, "jre.bundledJre64Bit",
-					Messages.getString("Jre.bundled.64bit.invalid"));
-			Validator.checkFalse(bundledJreAsFallback, "jre.bundledJreAsFallback",
-					Messages.getString("Jre.bundled.fallback.invalid"));
-			Validator.checkFalse(Validator.isEmpty(minVersion),
-					"jre.minVersion", Messages.getString("Jre.specify.jre.min.version.or.path"));
-		} else {
-			Validator.checkString(path, Validator.MAX_PATH,
-					"jre.path", Messages.getString("Jre.bundled.path"));
-		}
-		if (!Validator.isEmpty(maxVersion)) {
-			Validator.checkFalse(Validator.isEmpty(minVersion),
-					"jre.minVersion", Messages.getString("Jre.specify.min.version"));
-			Validator.checkTrue(minVersion.compareTo(maxVersion) < 0,
-					"jre.maxVersion", Messages.getString("Jre.max.greater.than.min"));
-		}
-		Validator.checkTrue(initialHeapSize == null || maxHeapSize != null,
-				"jre.maxHeapSize", Messages.getString("Jre.initial.and.max.heap"));
-		Validator.checkTrue(initialHeapSize == null || initialHeapSize.intValue() > 0,
-				"jre.initialHeapSize", Messages.getString("Jre.initial.heap"));
-		Validator.checkTrue(maxHeapSize == null || (maxHeapSize.intValue()
-				>= ((initialHeapSize != null) ? initialHeapSize.intValue() : 1)),
-				"jre.maxHeapSize", Messages.getString("Jre.max.heap"));
-		Validator.checkTrue(initialHeapPercent == null || maxHeapPercent != null,
-				"jre.maxHeapPercent", Messages.getString("Jre.initial.and.max.heap"));
-		if (initialHeapPercent != null) {
-			Validator.checkRange(initialHeapPercent.intValue(), 1, 100,
-					"jre.initialHeapPercent",
-					Messages.getString("Jre.initial.heap.percent"));
-		}
-		if (maxHeapPercent != null) {
-			Validator.checkRange(maxHeapPercent.intValue(),
-					initialHeapPercent != null ? initialHeapPercent.intValue() : 1, 100,
-					"jre.maxHeapPercent",
-					Messages.getString("Jre.max.heap.percent"));
-		}
-		Validator.checkIn(getJdkPreference(), JDK_PREFERENCE_NAMES,
-				"jre.jdkPreference", Messages.getString("Jre.jdkPreference"));
-		Validator.checkIn(getRuntimeBits(), RUNTIME_BITS_OPTIONS,
-				"jre.runtimeBits", Messages.getString("Jre.runtimeBits"));
-		Validator.checkOptStrings(options,
-				Validator.MAX_ARGS,
-				Validator.MAX_ARGS,
-				"[^\"]*|([^\"]*\"[^\"]*\"[^\"]*)*",
-				"jre.options",
-				Messages.getString("Jre.jvm.options"),
-				Messages.getString("Jre.jvm.options.unclosed.quotation"));
-
-		// Quoted variable references: "[^%]*|([^%]*\"([^%]*%[^%]+%[^%]*)+\"[^%]*)*"
-		Validator.checkOptStrings(options,
-				Validator.MAX_ARGS,
-				Validator.MAX_ARGS,
-				"[^%]*|([^%]*([^%]*%[^%]+%[^%]*)+[^%]*)*",
-				"jre.options",
-				Messages.getString("Jre.jvm.options"),
-				Messages.getString("Jre.jvm.options.variable"));
-	}
-
-	/** JVM options */
-	public List<String> getOptions() {
-		return options;
-	}
-
-	public void setOptions(List<String> options) {
-		this.options = options;
-	}
-
-	/** Max Java version (x.x.x) */
-	public String getMaxVersion() {
-		return maxVersion;
-	}
-
-	public void setMaxVersion(String maxVersion) {
-		this.maxVersion = maxVersion;
-	}
-
-	/** Min Java version (x.x.x) */
-	public String getMinVersion() {
-		return minVersion;
-	}
-
-	public void setMinVersion(String minVersion) {
-		this.minVersion = minVersion;
-	}
-
-	/** Preference for standalone JRE or JDK-private JRE */
-	public String getJdkPreference() {
-		return Validator.isEmpty(jdkPreference) ? JDK_PREFERENCE_PREFER_JRE
-												: jdkPreference;
-	}
-
-	public void setJdkPreference(String jdkPreference) {
-		this.jdkPreference = jdkPreference;
-	}
-
-	/** Preference for standalone JRE or JDK-private JRE */
-	public int getJdkPreferenceIndex() {
-		int x = Arrays.asList(JDK_PREFERENCE_NAMES).indexOf(getJdkPreference());
-		return x != -1 ? x : DEFAULT_JDK_PREFERENCE_INDEX;
-	}
-	
-	public void setJdkPreferenceIndex(int x) {
-		this.jdkPreference = JDK_PREFERENCE_NAMES[x];
-	}
-	
-	public String getRuntimeBits() {
-		return Validator.isEmpty(runtimeBits) ? RUNTIME_BITS_64_AND_32
-												: runtimeBits;
-	}
-
-	public void setRuntimeBits(String runtimeBits) {
-		this.runtimeBits = runtimeBits;
-	}
-	
-	public int getRuntimeBitsIndex() {
-		int x = Arrays.asList(RUNTIME_BITS_OPTIONS).indexOf(getRuntimeBits());
-		return x != -1 ? x : DEFAULT_RUNTIME_BITS_INDEX;
-	}
-	
-	public void setRuntimeBitsIndex(int x) {
-		this.runtimeBits = RUNTIME_BITS_OPTIONS[x];
-	}
-
-	/** JRE path */
-	public String getPath() {
-		return path;
-	}
-
-	public void setPath(String path) {
-		this.path = path;
-	}
-	
-	public boolean getBundledJre64Bit() {
-		return bundledJre64Bit;
-	}
-	
-	public void setBundledJre64Bit(boolean bundledJre64Bit) {
-		this.bundledJre64Bit = bundledJre64Bit;	
-	}
-	
-	public boolean getBundledJreAsFallback() {
-		return bundledJreAsFallback;
-	}
-	
-	public void setBundledJreAsFallback(boolean bundledJreAsFallback) {
-		this.bundledJreAsFallback = bundledJreAsFallback;
-	}
-
-	/** Initial heap size in MB */
-	public Integer getInitialHeapSize() {
-		return initialHeapSize;
-	}
-
-	public void setInitialHeapSize(Integer initialHeapSize) {
-		this.initialHeapSize = getInteger(initialHeapSize);
-	}
-
-	/** Max heap size in MB */
-	public Integer getMaxHeapSize() {
-		return maxHeapSize;
-	}
-
-	public void setMaxHeapSize(Integer maxHeapSize) {
-		this.maxHeapSize = getInteger(maxHeapSize);
-	}
-	
-	public Integer getInitialHeapPercent() {
-    	return initialHeapPercent;
-    }
-
-	public void setInitialHeapPercent(Integer initialHeapPercent) {
-    	this.initialHeapPercent = getInteger(initialHeapPercent);
-    }
-
-	public Integer getMaxHeapPercent() {
-    	return maxHeapPercent;
-    }
-
-	public void setMaxHeapPercent(Integer maxHeapPercent) {
-    	this.maxHeapPercent = getInteger(maxHeapPercent);
-    }
-
-	/** Convert 0 to null */
-	private Integer getInteger(Integer i) {
-		return i != null && i.intValue() == 0 ? null : i;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/LdDefaults.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/LdDefaults.java
deleted file mode 100644
index 5b4179c..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/LdDefaults.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Sep 3, 2005
- */
-package net.sf.launch4j.config;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class LdDefaults {
-
-	public static final List<String> GUI_HEADER_OBJECTS = Arrays.asList(new String[] {
-			"w32api/crt2.o",
-			"head/guihead.o",
-			"head/head.o" });
-
-	public static final List<String> CONSOLE_HEADER_OBJECTS = Arrays.asList(new String[] {
-			"w32api/crt2.o",
-			"head/consolehead.o",
-			"head/head.o"});
-
-	public static final List<String> LIBS = Arrays.asList(new String[] {
-			"w32api/libmingw32.a",
-			"w32api/libgcc.a",
-			"w32api/libmsvcrt.a",
-			"w32api/libkernel32.a",
-			"w32api/libuser32.a",
-			"w32api/libadvapi32.a",
-			"w32api/libshell32.a" });
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Messages.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Messages.java
deleted file mode 100644
index c0f0b9d..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Messages.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j.config;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "net.sf.launch4j.config.messages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-	private static final MessageFormat FORMATTER = new MessageFormat("");
-
-	private Messages() {
-	}
-	
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-	
-	public static String getString(String key, String arg0) {
-		return getString(key, new Object[] {arg0});
-	}
-
-	public static String getString(String key, String arg0, String arg1) {
-		return getString(key, new Object[] {arg0, arg1});
-	}
-
-	public static String getString(String key, String arg0, String arg1, String arg2) {
-		return getString(key, new Object[] {arg0, arg1, arg2});
-	}
-
-	public static String getString(String key, Object[] args) {
-		try {
-			FORMATTER.applyPattern(RESOURCE_BUNDLE.getString(key));
-			return FORMATTER.format(args);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Msg.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Msg.java
deleted file mode 100644
index a5d5fe5..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Msg.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Oct 8, 2006
- */
-package net.sf.launch4j.config;
-
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.binding.Validator;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class Msg implements IValidatable {
-	private String startupErr;
-	private String bundledJreErr;
-	private String jreVersionErr;
-	private String launcherErr;
-	private String instanceAlreadyExistsMsg;
-
-	public void checkInvariants() {
-		Validator.checkOptString(startupErr, 1024, "startupErr",
-				Messages.getString("Msg.startupErr"));
-		Validator.checkOptString(bundledJreErr, 1024, "bundledJreErr",
-				Messages.getString("Msg.bundledJreErr"));
-		Validator.checkOptString(jreVersionErr, 1024, "jreVersionErr",
-				Messages.getString("Msg.jreVersionErr"));
-		Validator.checkOptString(launcherErr, 1024, "launcherErr",
-				Messages.getString("Msg.launcherErr"));
-		Validator.checkOptString(instanceAlreadyExistsMsg, 1024, "instanceAlreadyExistsMsg",
-				Messages.getString("Msg.instanceAlreadyExistsMsg"));
-	}
-
-	public String getStartupErr() {
-		return !Validator.isEmpty(startupErr) ? startupErr
-				: "An error occurred while starting the application.";
-	}
-	
-	public void setStartupErr(String startupErr) {
-		this.startupErr = startupErr;
-	}
-
-	public String getBundledJreErr() {
-		return !Validator.isEmpty(bundledJreErr) ? bundledJreErr
-				: "This application was configured to use a bundled Java Runtime" +
-						" Environment but the runtime is missing or corrupted.";
-	}
-
-	public void setBundledJreErr(String bundledJreErr) {
-		this.bundledJreErr = bundledJreErr;
-	}
-
-	public String getJreVersionErr() {
-		return !Validator.isEmpty(jreVersionErr) ? jreVersionErr
-				: "This application requires a Java Runtime Environment";
-	}
-
-	public void setJreVersionErr(String jreVersionErr) {
-		this.jreVersionErr = jreVersionErr;
-	}
-	
-	public String getLauncherErr() {
-		return !Validator.isEmpty(launcherErr) ? launcherErr
-				: "The registry refers to a nonexistent Java Runtime Environment" +
-						" installation or the runtime is corrupted.";
-	}
-	
-	public void setLauncherErr(String launcherErr) {
-		this.launcherErr = launcherErr;
-	}
-
-	public String getInstanceAlreadyExistsMsg() {
-    	return !Validator.isEmpty(instanceAlreadyExistsMsg) ? instanceAlreadyExistsMsg
-    			: "An application instance is already running.";
-    }
-
-	public void setInstanceAlreadyExistsMsg(String instanceAlreadyExistsMsg) {
-    	this.instanceAlreadyExistsMsg = instanceAlreadyExistsMsg;
-    }
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/SingleInstance.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/SingleInstance.java
deleted file mode 100644
index d8fdd7a..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/SingleInstance.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
- * Created on 2007-09-16
- */
-package net.sf.launch4j.config;
-
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.binding.Validator;
-
-/**
- * @author Copyright (C) 2007 Grzegorz Kowal
- */
-public class SingleInstance implements IValidatable {
-
-	private String mutexName;
-	private String windowTitle;
-	
-	public void checkInvariants() {
-		Validator.checkString(mutexName, Validator.MAX_STR,
-				"singleInstance.mutexName",
-				Messages.getString("SingleInstance.mutexName"));
-		Validator.checkOptString(windowTitle, Validator.MAX_STR,
-				"singleInstance.windowTitle",
-				Messages.getString("SingleInstance.windowTitle"));
-	}
-	
-	public String getWindowTitle() {
-    	return windowTitle;
-    }
-	
-	public void setWindowTitle(String appWindowName) {
-    	this.windowTitle = appWindowName;
-    }
-	
-	public String getMutexName() {
-    	return mutexName;
-    }
-	
-	public void setMutexName(String mutexName) {
-    	this.mutexName = mutexName;
-    }
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Splash.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Splash.java
deleted file mode 100644
index 47f76d8..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/Splash.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Apr 21, 2005
- */
-package net.sf.launch4j.config;
-
-import java.io.File;
-
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.binding.Validator;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class Splash implements IValidatable {
-	
-	// 1.x config properties_____________________________________________________________
-	public static final String SPLASH_FILE = "splash";
-	public static final String WAIT_FOR_TITLE = "waitForTitle";
-	public static final String TIMEOUT = "splashTimeout";
-	public static final String TIMEOUT_ERR = "splashTimeoutErr";
-
-	// __________________________________________________________________________________
-	private File file;
-	private boolean waitForWindow = true;
-	private int timeout = 60;
-	private boolean timeoutErr = true;
-
-	public void checkInvariants() {
-		Validator.checkFile(file, "splash.file",
-				Messages.getString("Splash.splash.file"));
-		Validator.checkRange(timeout, 1, 60 * 15, "splash.timeout",
-				Messages.getString("Splash.splash.timeout"));
-	}
-
-	/** Splash screen in BMP format. */
-	public File getFile() {
-		return file;
-	}
-
-	public void setFile(File file) {
-		this.file = file;
-	}
-
-	/** Splash timeout in seconds. */
-	public int getTimeout() {
-		return timeout;
-	}
-
-	public void setTimeout(int timeout) {
-		this.timeout = timeout;
-	}
-
-	/** Signal error on splash timeout. */
-	public boolean isTimeoutErr() {
-		return timeoutErr;
-	}
-
-	public void setTimeoutErr(boolean timeoutErr) {
-		this.timeoutErr = timeoutErr;
-	}
-
-	/** Hide splash screen when the child process displayes the first window. */
-	public boolean getWaitForWindow() {
-		return waitForWindow;
-	}
-
-	public void setWaitForWindow(boolean waitForWindow) {
-		this.waitForWindow = waitForWindow;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/VersionInfo.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/VersionInfo.java
deleted file mode 100644
index 9a24abd..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/VersionInfo.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 21, 2005
- */
-package net.sf.launch4j.config;
-
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.binding.Validator;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class VersionInfo implements IValidatable {
-	public static final String VERSION_PATTERN = "(\\d+\\.){3}\\d+";
-
-	private String fileVersion;
-	private String txtFileVersion;
-	private String fileDescription;
-	private String copyright;
-	private String productVersion;
-	private String txtProductVersion;
-	private String productName;
-	private String companyName;
-	private String internalName;
-	private String originalFilename;
-
-	public void checkInvariants() {
-		Validator.checkString(fileVersion, 20, VERSION_PATTERN,
-				"versionInfo.fileVersion",
-				Messages.getString("VersionInfo.file.version"));
-		Validator.checkString(txtFileVersion, 50, "versionInfo.txtFileVersion",
-				Messages.getString("VersionInfo.txt.file.version"));
-		Validator.checkString(fileDescription, 150, "versionInfo.fileDescription",
-				Messages.getString("VersionInfo.file.description"));
-		Validator.checkString(copyright, 150, "versionInfo.copyright",
-				Messages.getString("VersionInfo.copyright"));
-		Validator.checkString(productVersion, 20, VERSION_PATTERN,
-				"versionInfo.productVersion",
-				Messages.getString("VersionInfo.product.version"));
-		Validator.checkString(txtProductVersion, 50, "versionInfo.txtProductVersion",
-				Messages.getString("VersionInfo.txt.product.version"));
-		Validator.checkString(productName, 150, "versionInfo.productName",
-				Messages.getString("VersionInfo.product.name"));
-		Validator.checkOptString(companyName, 150, "versionInfo.companyName",
-				Messages.getString("VersionInfo.company.name"));
-		Validator.checkString(internalName, 50, 	"versionInfo.internalName",
-				Messages.getString("VersionInfo.internal.name"));
-		Validator.checkTrue(!internalName.endsWith(".exe"), "versionInfo.internalName",
-				Messages.getString("VersionInfo.internal.name.not.exe"));
-		Validator.checkString(originalFilename, 50, "versionInfo.originalFilename",
-				Messages.getString("VersionInfo.original.filename"));
-		Validator.checkTrue(originalFilename.endsWith(".exe"),
-				"versionInfo.originalFilename",
-				Messages.getString("VersionInfo.original.filename.exe"));
-	}
-
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-
-	public String getCopyright() {
-		return copyright;
-	}
-
-	public void setCopyright(String copyright) {
-		this.copyright = copyright;
-	}
-
-	public String getFileDescription() {
-		return fileDescription;
-	}
-
-	public void setFileDescription(String fileDescription) {
-		this.fileDescription = fileDescription;
-	}
-
-	public String getFileVersion() {
-		return fileVersion;
-	}
-
-	public void setFileVersion(String fileVersion) {
-		this.fileVersion = fileVersion;
-	}
-
-	public String getInternalName() {
-		return internalName;
-	}
-
-	public void setInternalName(String internalName) {
-		this.internalName = internalName;
-	}
-
-	public String getOriginalFilename() {
-		return originalFilename;
-	}
-
-	public void setOriginalFilename(String originalFilename) {
-		this.originalFilename = originalFilename;
-	}
-
-	public String getProductName() {
-		return productName;
-	}
-
-	public void setProductName(String productName) {
-		this.productName = productName;
-	}
-
-	public String getProductVersion() {
-		return productVersion;
-	}
-
-	public void setProductVersion(String productVersion) {
-		this.productVersion = productVersion;
-	}
-
-	public String getTxtFileVersion() {
-		return txtFileVersion;
-	}
-
-	public void setTxtFileVersion(String txtFileVersion) {
-		this.txtFileVersion = txtFileVersion;
-	}
-
-	public String getTxtProductVersion() {
-		return txtProductVersion;
-	}
-
-	public void setTxtProductVersion(String txtProductVersion) {
-		this.txtProductVersion = txtProductVersion;
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/messages.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/messages.properties
deleted file mode 100644
index cae66fa..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/messages.properties
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2015 Grzegorz Kowal
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-Splash.splash.file=Splash file
-Splash.splash.timeout=Splash timeout
-
-Config.specify.output.exe=Specify output file with .exe extension.
-Config.application.jar=Application jar
-Config.application.jar.path=Specify runtime path of the jar relative to the executable.
-Config.chdir.relative='chdir' must be a path relative to the executable.
-Config.chdir.path='chdir' is now a path instead of a boolean, please check the docs.
-Config.manifest=Manifest
-Config.icon=Icon
-Config.jar.arguments=Jar arguments
-Config.error.title=Error title
-Config.download.url=Download URL
-Config.support.url=Support URL
-Config.header.type=Header type
-Config.splash.not.impl.by.console.hdr=Splash screen is not implemented by console header.
-Config.variables=Environment variables
-Config.variables.err=Environment variable assignment should have the form varname=[value][%varref%]...
-Config.priority=Process priority
-
-ClassPath.mainClass=Main class
-ClassPath.or.jar=Specify runtime path of a jar or the classpath.
-ClassPath.path=Classpath
-
-VersionInfo.file.version=File version, should be 'x.x.x.x'
-VersionInfo.txt.file.version=Free form file version
-VersionInfo.file.description=File description
-VersionInfo.copyright=Copyright
-VersionInfo.product.version=Product version, should be 'x.x.x.x'
-VersionInfo.txt.product.version=Free from product version
-VersionInfo.product.name=Product name
-VersionInfo.company.name=Company name
-VersionInfo.internal.name=Internal name
-VersionInfo.internal.name.not.exe=Internal name shouldn't have the .exe extension.
-VersionInfo.original.filename=Original filename
-VersionInfo.original.filename.exe=Original filename should end with the .exe extension.
-
-Jre.min.version=Minimum JRE version should be x.x.x[_xx]
-Jre.max.version=Maximum JRE version should be x.x.x[_xx]
-Jre.specify.jre.min.version.or.path=Specify minimum JRE version and/or bundled JRE path.
-Jre.bundled.path=Bundled JRE path
-Jre.bundled.64bit.invalid=The bundled JRE 64-bit option can only be used if the JRE path is specified.
-Jre.bundled.fallback.invalid=The bundled JRE as fallback option can only be used if the JRE path is specified.
-Jre.specify.min.version=Specify minimum JRE version.
-Jre.max.greater.than.min=Maximum JRE version must be greater than the minimum.\nTo use a certain JRE version, you may set the min/max range to [1.4.2 - 1.4.2_10] for example.
-Jre.initial.and.max.heap=If you change the initial heap size please also specify the maximum size.
-Jre.initial.heap=Initial heap size must be greater than 0, leave the field blank to use the JVM default.
-Jre.max.heap=Maximum heap size cannot be less than the initial size, leave the field blank to use the JVM default.
-Jre.initial.heap.percent=Initial heap %
-Jre.max.heap.percent=Maximum heap %
-Jre.jdkPreference=JDK preference
-Jre.runtimeBits=Runtime bits
-Jre.jvm.options=JVM arguments
-Jre.jvm.options.unclosed.quotation=JVM arguments contain an unclosed quotation.
-Jre.jvm.options.variable=Invalid environment variable reference.
-
-Msg.startupErr=Startup error message
-Msg.bundledJreErr=Bundled JRE error message
-Msg.jreVersionErr=JRE version error message
-Msg.launcherErr=Launcher error message
-
-SingleInstance.mutexName=Mutex name
-SingleInstance.windowTitle=Window title
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/messages_es.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/messages_es.properties
deleted file mode 100644
index 5b897d0..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/config/messages_es.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2007 Grzegorz Kowal, Patricio Mart�nez Ros
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-Splash.splash.file = Fichero de la pantalla de bienvenida
-Splash.splash.timeout = Tiempo de espera de la pantalla de bienvenida
-
-Config.specify.output.exe = Especifique el fichero de salida con extensi\u00F3n .exe.
-Config.application.jar = Aplicaci\u00F3n jar
-Config.application.jar.path = Especifique la ruta del jar relativa al ejecutable. 
-Config.chdir.relative = 'Cambiar al directorio' debe ser una ruta relativa al ejecutable.
-Config.chdir.path = 'Cambiar al directorio' ahora es una ruta en lugar de un booleano, por favor consulte la documentaci\u00F3n.
-Config.icon = Icono
-Config.jar.arguments = Argumentos del jar
-Config.error.title = T\u00EDtulo de error
-Config.header.type = Tipo de cabecera
-Config.splash.not.impl.by.console.hdr = La pantalla de bienvenida no est\u00E1 implementada para la cabecera de tipo consola.
-
-VersionInfo.file.version = La versi\u00F3n del fichero, deber\u00EDa ser 'x.x.x.x'
-VersionInfo.txt.file.version = Forma libre de versi\u00F3n del fichero
-VersionInfo.file.description = Descripci\u00F3n del fichero
-VersionInfo.copyright = Copyright
-VersionInfo.product.version = Versi\u00F3n del producto, deber\u00EDa ser 'x.x.x.x'
-VersionInfo.txt.product.version = Forma libre de versi\u00F3n del producto
-VersionInfo.product.name = Nombre del producto
-VersionInfo.company.name = Nombre de la organizaci\u00F3n
-VersionInfo.internal.name = Nombre interno
-VersionInfo.internal.name.not.exe = El nombre interno no deber\u00EDa tener extensi\u00F3n .exe.
-VersionInfo.original.filename = Nombre original del fichero
-VersionInfo.original.filename.exe = El nombre original del fichero debe acabar con extensi\u00F3n .exe.
-Jre.min.version = La versi\u00F3n m\u00EDnima del JRE deber\u00EDa ser x.x.x[_xx]
-Jre.max.version = La versi\u00F3n m\u00E1xima del JRE deber\u00EDa ser x.x.x[_xx]
-Jre.specify.jre.min.version.or.path=Specify minimum JRE version and/or bundled JRE path.
-Jre.bundled.path.rel = La ruta del JRE debe ser relativa al ejecutable.
-Jre.specify.min.version = Especifique la versi\u00F3n m\u00EDnima del JRE.
-Jre.max.greater.than.min = La versi\u00F3n m\u00E1xima del JRE debe ser mayor que la m\u00EDnima.\nPara usar cierta versi\u00F3n del JRE, puede esyablecer el rango m\u00EDnimo/m\u00E1ximo a [1.4.2 - 1.4.2_10], por ejemplo.
-Jre.jvm.options = Argumentos de la JVM
-
-Msg.startupErr=Startup error message
-Msg.bundledJreErr=Bundled JRE error message
-Msg.jreVersionErr=JRE version error message
-Msg.launcherErr=Launcher error message
-
-SingleInstance.mutexName=Mutex name
-SingleInstance.windowTitle=Window title
-
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/BasicForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/BasicForm.java
deleted file mode 100644
index b53458c..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/BasicForm.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jeta.forms.components.separator.TitledSeparator;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-public abstract class BasicForm extends JPanel
-{
-   protected final JButton _outfileButton = new JButton();
-   protected final JLabel _outfileLabel = new JLabel();
-   protected final JLabel _iconLabel = new JLabel();
-   protected final JLabel _jarLabel = new JLabel();
-   protected final JButton _jarButton = new JButton();
-   protected final JButton _iconButton = new JButton();
-   protected final JLabel _cmdLineLabel = new JLabel();
-   protected final JLabel _optionsLabel = new JLabel();
-   protected final JLabel _chdirLabel = new JLabel();
-   protected final JLabel _processPriorityLabel = new JLabel();
-   protected final JRadioButton _normalPriorityRadio = new JRadioButton();
-   protected final ButtonGroup _buttongroup1 = new ButtonGroup();
-   protected final JRadioButton _idlePriorityRadio = new JRadioButton();
-   protected final JRadioButton _highPriorityRadio = new JRadioButton();
-   protected final JTextField _cmdLineField = new JTextField();
-   protected final JTextField _chdirField = new JTextField();
-   protected final JTextField _iconField = new JTextField();
-   protected final JCheckBox _dontWrapJarCheck = new JCheckBox();
-   protected final JTextField _jarField = new JTextField();
-   protected final JTextField _outfileField = new JTextField();
-   protected final JLabel _errorTitleLabel = new JLabel();
-   protected final JTextField _errorTitleField = new JTextField();
-   protected final JLabel _downloadUrlLabel = new JLabel();
-   protected final JTextField _downloadUrlField = new JTextField();
-   protected final JLabel _supportUrlLabel = new JLabel();
-   protected final JTextField _supportUrlField = new JTextField();
-   protected final JTextField _manifestField = new JTextField();
-   protected final JButton _manifestButton = new JButton();
-   protected final JCheckBox _stayAliveCheck = new JCheckBox();
-   protected final JCheckBox _restartOnCrashCheck = new JCheckBox();
-
-   /**
-    * Default constructor
-    */
-   public BasicForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:7DLU:NONE,FILL:DEFAULT:NONE,FILL:7DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:3DLU:NONE,FILL:26PX:NONE,FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFA [...]
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _outfileButton.setIcon(loadImage("images/open16.png"));
-      _outfileButton.setName("outfileButton");
-      jpanel1.add(_outfileButton,cc.xy(12,2));
-
-      _outfileLabel.setIcon(loadImage("images/asterix.gif"));
-      _outfileLabel.setName("outfileLabel");
-      _outfileLabel.setText(Messages.getString("outfile"));
-      jpanel1.add(_outfileLabel,cc.xy(2,2));
-
-      _iconLabel.setName("iconLabel");
-      _iconLabel.setText(Messages.getString("icon"));
-      jpanel1.add(_iconLabel,cc.xy(2,10));
-
-      _jarLabel.setIcon(loadImage("images/asterix.gif"));
-      _jarLabel.setName("jarLabel");
-      _jarLabel.setText(Messages.getString("jar"));
-      jpanel1.add(_jarLabel,cc.xy(2,4));
-
-      _jarButton.setIcon(loadImage("images/open16.png"));
-      _jarButton.setName("jarButton");
-      jpanel1.add(_jarButton,cc.xy(12,4));
-
-      _iconButton.setIcon(loadImage("images/open16.png"));
-      _iconButton.setName("iconButton");
-      jpanel1.add(_iconButton,cc.xy(12,10));
-
-      _cmdLineLabel.setName("cmdLineLabel");
-      _cmdLineLabel.setText(Messages.getString("cmdLine"));
-      _cmdLineLabel.setToolTipText("");
-      jpanel1.add(_cmdLineLabel,cc.xy(2,14));
-
-      _optionsLabel.setName("optionsLabel");
-      _optionsLabel.setText(Messages.getString("options"));
-      jpanel1.add(_optionsLabel,cc.xy(2,18));
-
-      _chdirLabel.setName("chdirLabel");
-      _chdirLabel.setText(Messages.getString("chdir"));
-      jpanel1.add(_chdirLabel,cc.xy(2,12));
-
-      _processPriorityLabel.setName("processPriorityLabel");
-      _processPriorityLabel.setText(Messages.getString("priority"));
-      jpanel1.add(_processPriorityLabel,cc.xy(2,16));
-
-      _normalPriorityRadio.setActionCommand(Messages.getString("normalPriority"));
-      _normalPriorityRadio.setName("normalPriorityRadio");
-      _normalPriorityRadio.setText(Messages.getString("normalPriority"));
-      _buttongroup1.add(_normalPriorityRadio);
-      jpanel1.add(_normalPriorityRadio,cc.xy(4,16));
-
-      _idlePriorityRadio.setActionCommand(Messages.getString("idlePriority"));
-      _idlePriorityRadio.setName("idlePriorityRadio");
-      _idlePriorityRadio.setText(Messages.getString("idlePriority"));
-      _buttongroup1.add(_idlePriorityRadio);
-      jpanel1.add(_idlePriorityRadio,cc.xy(6,16));
-
-      _highPriorityRadio.setActionCommand(Messages.getString("highPriority"));
-      _highPriorityRadio.setName("highPriorityRadio");
-      _highPriorityRadio.setText(Messages.getString("highPriority"));
-      _buttongroup1.add(_highPriorityRadio);
-      jpanel1.add(_highPriorityRadio,cc.xy(8,16));
-
-      _cmdLineField.setName("cmdLineField");
-      _cmdLineField.setToolTipText(Messages.getString("cmdLineTip"));
-      jpanel1.add(_cmdLineField,cc.xywh(4,14,7,1));
-
-      _chdirField.setName("chdirField");
-      _chdirField.setToolTipText(Messages.getString("chdirTip"));
-      jpanel1.add(_chdirField,cc.xywh(4,12,7,1));
-
-      _iconField.setName("iconField");
-      _iconField.setToolTipText(Messages.getString("iconTip"));
-      jpanel1.add(_iconField,cc.xywh(4,10,7,1));
-
-      _dontWrapJarCheck.setActionCommand("Don't wrap the jar, launch it only");
-      _dontWrapJarCheck.setName("dontWrapJarCheck");
-      _dontWrapJarCheck.setText(Messages.getString("dontWrapJar"));
-      jpanel1.add(_dontWrapJarCheck,cc.xywh(4,6,7,1));
-
-      _jarField.setName("jarField");
-      _jarField.setToolTipText(Messages.getString("jarTip"));
-      jpanel1.add(_jarField,cc.xywh(4,4,7,1));
-
-      _outfileField.setName("outfileField");
-      _outfileField.setToolTipText(Messages.getString("outfileTip"));
-      jpanel1.add(_outfileField,cc.xywh(4,2,7,1));
-
-      TitledSeparator titledseparator1 = new TitledSeparator();
-      titledseparator1.setText(Messages.getString("downloadAndSupport"));
-      jpanel1.add(titledseparator1,cc.xywh(2,22,11,1));
-
-      _errorTitleLabel.setName("errorTitleLabel");
-      _errorTitleLabel.setText(Messages.getString("errorTitle"));
-      jpanel1.add(_errorTitleLabel,cc.xy(2,24));
-
-      _errorTitleField.setName("errorTitleField");
-      _errorTitleField.setToolTipText(Messages.getString("errorTitleTip"));
-      jpanel1.add(_errorTitleField,cc.xywh(4,24,7,1));
-
-      _downloadUrlLabel.setIcon(loadImage("images/asterix.gif"));
-      _downloadUrlLabel.setName("downloadUrlLabel");
-      _downloadUrlLabel.setText(Messages.getString("downloadUrl"));
-      jpanel1.add(_downloadUrlLabel,cc.xy(2,26));
-
-      _downloadUrlField.setName("downloadUrlField");
-      jpanel1.add(_downloadUrlField,cc.xywh(4,26,7,1));
-
-      _supportUrlLabel.setName("supportUrlLabel");
-      _supportUrlLabel.setText(Messages.getString("supportUrl"));
-      jpanel1.add(_supportUrlLabel,cc.xy(2,28));
-
-      _supportUrlField.setName("supportUrlField");
-      jpanel1.add(_supportUrlField,cc.xywh(4,28,7,1));
-
-      JLabel jlabel1 = new JLabel();
-      jlabel1.setText(Messages.getString("manifest"));
-      jpanel1.add(jlabel1,cc.xy(2,8));
-
-      _manifestField.setName("manifestField");
-      _manifestField.setToolTipText(Messages.getString("manifestTip"));
-      jpanel1.add(_manifestField,cc.xywh(4,8,7,1));
-
-      _manifestButton.setIcon(loadImage("images/open16.png"));
-      _manifestButton.setName("manifestButton");
-      jpanel1.add(_manifestButton,cc.xy(12,8));
-
-      _stayAliveCheck.setActionCommand("Stay alive after launching a GUI application");
-      _stayAliveCheck.setName("stayAliveCheck");
-      _stayAliveCheck.setText(Messages.getString("stayAlive"));
-      jpanel1.add(_stayAliveCheck,cc.xywh(4,18,7,1));
-
-      _restartOnCrashCheck.setActionCommand("Restart the application after a crash");
-      _restartOnCrashCheck.setName("restartOnCrashCheck");
-      _restartOnCrashCheck.setText(Messages.getString("restartOnCrash"));
-      _restartOnCrashCheck.setToolTipText(Messages.getString("restartOnCrashToolTip"));
-      jpanel1.add(_restartOnCrashCheck,cc.xywh(4,20,7,1));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/BasicForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/BasicForm.jfrm
deleted file mode 100644
index 0325724..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/BasicForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ClassPathForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ClassPathForm.java
deleted file mode 100644
index f19d08e..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ClassPathForm.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-
-public abstract class ClassPathForm extends JPanel
-{
-   protected final JTextField _classpathField = new JTextField();
-   protected final JLabel _classpathFieldLabel = new JLabel();
-   protected final JLabel _classpathListLabel = new JLabel();
-   protected final JList _classpathList = new JList();
-   protected final JLabel _mainclassLabel = new JLabel();
-   protected final JTextField _mainclassField = new JTextField();
-   protected final JButton _acceptClasspathButton = new JButton();
-   protected final JButton _removeClasspathButton = new JButton();
-   protected final JButton _importClasspathButton = new JButton();
-   protected final JButton _classpathUpButton = new JButton();
-   protected final JButton _classpathDownButton = new JButton();
-   protected final JCheckBox _classpathCheck = new JCheckBox();
-   protected final JButton _newClasspathButton = new JButton();
-
-   /**
-    * Default constructor
-    */
-   public ClassPathForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:3DLU:NONE,FILL:26PX:NONE,FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:GROW(1.0),CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER [...]
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _classpathField.setName("classpathField");
-      jpanel1.add(_classpathField,cc.xywh(4,11,7,1));
-
-      _classpathFieldLabel.setIcon(loadImage("images/asterix.gif"));
-      _classpathFieldLabel.setName("classpathFieldLabel");
-      _classpathFieldLabel.setText(Messages.getString("editClassPath"));
-      jpanel1.add(_classpathFieldLabel,cc.xy(2,11));
-
-      _classpathListLabel.setName("classpathListLabel");
-      _classpathListLabel.setText(Messages.getString("classPath"));
-      jpanel1.add(_classpathListLabel,cc.xy(2,6));
-
-      _classpathList.setName("classpathList");
-      JScrollPane jscrollpane1 = new JScrollPane();
-      jscrollpane1.setViewportView(_classpathList);
-      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane1,cc.xywh(4,6,7,4));
-
-      _mainclassLabel.setIcon(loadImage("images/asterix.gif"));
-      _mainclassLabel.setName("mainclassLabel");
-      _mainclassLabel.setText(Messages.getString("mainClass"));
-      jpanel1.add(_mainclassLabel,cc.xy(2,4));
-
-      _mainclassField.setName("mainclassField");
-      jpanel1.add(_mainclassField,cc.xywh(4,4,7,1));
-
-      _acceptClasspathButton.setActionCommand("Add");
-      _acceptClasspathButton.setIcon(loadImage("images/ok16.png"));
-      _acceptClasspathButton.setName("acceptClasspathButton");
-      _acceptClasspathButton.setText(Messages.getString("accept"));
-      jpanel1.add(_acceptClasspathButton,cc.xy(8,13));
-
-      _removeClasspathButton.setActionCommand("Remove");
-      _removeClasspathButton.setIcon(loadImage("images/cancel16.png"));
-      _removeClasspathButton.setName("removeClasspathButton");
-      _removeClasspathButton.setText(Messages.getString("remove"));
-      jpanel1.add(_removeClasspathButton,cc.xy(10,13));
-
-      _importClasspathButton.setIcon(loadImage("images/open16.png"));
-      _importClasspathButton.setName("importClasspathButton");
-      _importClasspathButton.setToolTipText(Messages.getString("importClassPath"));
-      jpanel1.add(_importClasspathButton,cc.xy(12,4));
-
-      _classpathUpButton.setIcon(loadImage("images/up16.png"));
-      _classpathUpButton.setName("classpathUpButton");
-      jpanel1.add(_classpathUpButton,cc.xy(12,6));
-
-      _classpathDownButton.setIcon(loadImage("images/down16.png"));
-      _classpathDownButton.setName("classpathDownButton");
-      jpanel1.add(_classpathDownButton,cc.xy(12,8));
-
-      _classpathCheck.setActionCommand("Custom classpath");
-      _classpathCheck.setName("classpathCheck");
-      _classpathCheck.setText(Messages.getString("customClassPath"));
-      jpanel1.add(_classpathCheck,cc.xy(4,2));
-
-      _newClasspathButton.setActionCommand("New");
-      _newClasspathButton.setIcon(loadImage("images/new16.png"));
-      _newClasspathButton.setName("newClasspathButton");
-      _newClasspathButton.setText(Messages.getString("new"));
-      jpanel1.add(_newClasspathButton,cc.xy(6,13));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ClassPathForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ClassPathForm.jfrm
deleted file mode 100644
index 764329d..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ClassPathForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ConfigForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ConfigForm.java
deleted file mode 100644
index dcb6c85..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ConfigForm.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jeta.forms.components.separator.TitledSeparator;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-
-public abstract class ConfigForm extends JPanel
-{
-   protected final JTextArea _logTextArea = new JTextArea();
-   protected final TitledSeparator _logSeparator = new TitledSeparator();
-   protected final JTabbedPane _tab = new JTabbedPane();
-
-   /**
-    * Default constructor
-    */
-   public ConfigForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:7DLU:NONE","CENTER:3DLU:NONE,FILL:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:9DLU:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _logTextArea.setName("logTextArea");
-      JScrollPane jscrollpane1 = new JScrollPane();
-      jscrollpane1.setViewportView(_logTextArea);
-      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane1,cc.xy(2,6));
-
-      _logSeparator.setName("logSeparator");
-      _logSeparator.setText(Messages.getString("log"));
-      jpanel1.add(_logSeparator,cc.xy(2,4));
-
-      _tab.setName("tab");
-      jpanel1.add(_tab,cc.xywh(1,2,3,1));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,3,4,5,6,7 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ConfigForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ConfigForm.jfrm
deleted file mode 100644
index 2c6721e..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/ConfigForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/EnvironmentVarsForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/EnvironmentVarsForm.java
deleted file mode 100644
index 17e99fb..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/EnvironmentVarsForm.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-public abstract class EnvironmentVarsForm extends JPanel
-{
-   protected final JTextArea _envVarsTextArea = new JTextArea();
-   protected final JLabel _envVarsLabel = new JLabel();
-
-   /**
-    * Default constructor
-    */
-   public EnvironmentVarsForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:7DLU:NONE","CENTER:9DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:9DLU:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _envVarsTextArea.setName("envVarsTextArea");
-      JScrollPane jscrollpane1 = new JScrollPane();
-      jscrollpane1.setViewportView(_envVarsTextArea);
-      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane1,cc.xy(4,2));
-
-      _envVarsLabel.setName("envVarsLabel");
-      _envVarsLabel.setText(Messages.getString("setVariables"));
-      jpanel1.add(_envVarsLabel,new CellConstraints(2,2,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/EnvironmentVarsForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/EnvironmentVarsForm.jfrm
deleted file mode 100644
index 6e89ec4..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/EnvironmentVarsForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/HeaderForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/HeaderForm.java
deleted file mode 100644
index ef5dac4..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/HeaderForm.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jeta.forms.components.separator.TitledSeparator;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-public abstract class HeaderForm extends JPanel
-{
-   protected final JLabel _headerTypeLabel = new JLabel();
-   protected final JRadioButton _guiHeaderRadio = new JRadioButton();
-   protected final ButtonGroup _headerButtonGroup = new ButtonGroup();
-   protected final JRadioButton _consoleHeaderRadio = new JRadioButton();
-   protected final JTextArea _headerObjectsTextArea = new JTextArea();
-   protected final JTextArea _libsTextArea = new JTextArea();
-   protected final JCheckBox _headerObjectsCheck = new JCheckBox();
-   protected final JCheckBox _libsCheck = new JCheckBox();
-   protected final TitledSeparator _linkerOptionsSeparator = new TitledSeparator();
-
-   /**
-    * Default constructor
-    */
-   public HeaderForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:7DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,FILL:DEFAULT:GROW(0.2),CENTER:3DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:9DLU:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _headerTypeLabel.setName("headerTypeLabel");
-      _headerTypeLabel.setText(Messages.getString("headerType"));
-      jpanel1.add(_headerTypeLabel,cc.xy(2,2));
-
-      _guiHeaderRadio.setActionCommand("GUI");
-      _guiHeaderRadio.setName("guiHeaderRadio");
-      _guiHeaderRadio.setText(Messages.getString("gui"));
-      _headerButtonGroup.add(_guiHeaderRadio);
-      jpanel1.add(_guiHeaderRadio,cc.xy(4,2));
-
-      _consoleHeaderRadio.setActionCommand("Console");
-      _consoleHeaderRadio.setName("consoleHeaderRadio");
-      _consoleHeaderRadio.setText(Messages.getString("console"));
-      _headerButtonGroup.add(_consoleHeaderRadio);
-      jpanel1.add(_consoleHeaderRadio,cc.xy(6,2));
-
-      _headerObjectsTextArea.setName("headerObjectsTextArea");
-      JScrollPane jscrollpane1 = new JScrollPane();
-      jscrollpane1.setViewportView(_headerObjectsTextArea);
-      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane1,cc.xywh(4,6,4,1));
-
-      _libsTextArea.setName("libsTextArea");
-      JScrollPane jscrollpane2 = new JScrollPane();
-      jscrollpane2.setViewportView(_libsTextArea);
-      jscrollpane2.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane2.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane2,cc.xywh(4,8,4,1));
-
-      _headerObjectsCheck.setActionCommand("Object files");
-      _headerObjectsCheck.setName("headerObjectsCheck");
-      _headerObjectsCheck.setText(Messages.getString("objectFiles"));
-      jpanel1.add(_headerObjectsCheck,new CellConstraints(2,6,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      _libsCheck.setActionCommand("w32api");
-      _libsCheck.setName("libsCheck");
-      _libsCheck.setText(Messages.getString("libs"));
-      jpanel1.add(_libsCheck,new CellConstraints(2,8,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      _linkerOptionsSeparator.setName("linkerOptionsSeparator");
-      _linkerOptionsSeparator.setText(Messages.getString("linkerOptions"));
-      jpanel1.add(_linkerOptionsSeparator,cc.xywh(2,4,6,1));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8 },new int[]{ 1,2,3,4,5,6,7,8,9 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/HeaderForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/HeaderForm.jfrm
deleted file mode 100644
index a7cbed1..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/HeaderForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/JreForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/JreForm.java
deleted file mode 100644
index 979b81c..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/JreForm.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jeta.forms.components.separator.TitledSeparator;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-public abstract class JreForm extends JPanel
-{
-   protected final JLabel _jrePathLabel = new JLabel();
-   protected final JLabel _jreMinLabel = new JLabel();
-   protected final JLabel _jreMaxLabel = new JLabel();
-   protected final JLabel _jvmOptionsTextLabel = new JLabel();
-   protected final JTextField _jreMinField = new JTextField();
-   protected final JTextField _jreMaxField = new JTextField();
-   protected final JTextArea _jvmOptionsTextArea = new JTextArea();
-   protected final JLabel _initialHeapSizeLabel = new JLabel();
-   protected final JLabel _maxHeapSizeLabel = new JLabel();
-   protected final JTextField _initialHeapSizeField = new JTextField();
-   protected final JTextField _maxHeapSizeField = new JTextField();
-   protected final JTextField _maxHeapPercentField = new JTextField();
-   protected final JTextField _initialHeapPercentField = new JTextField();
-   protected final JComboBox _jdkPreferenceCombo = new JComboBox();
-   protected final JComboBox _runtimeBitsCombo = new JComboBox();
-   protected final JComboBox _varCombo = new JComboBox();
-   protected final JButton _propertyButton = new JButton();
-   protected final JButton _optionButton = new JButton();
-   protected final JButton _envPropertyButton = new JButton();
-   protected final JButton _envOptionButton = new JButton();
-   protected final JTextField _envVarField = new JTextField();
-   protected final JTextField _jrePathField = new JTextField();
-   protected final JCheckBox _bundledJre64BitCheck = new JCheckBox();
-   protected final JCheckBox _bundledJreAsFallbackCheck = new JCheckBox();
-
-   /**
-    * Default constructor
-    */
-   public JreForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:60DLU:NONE,FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:7DLU:NONE,FILL:60DLU:NONE,FILL:3DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFA [...]
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _jrePathLabel.setName("jrePathLabel");
-      _jrePathLabel.setText(Messages.getString("jrePath"));
-      jpanel1.add(_jrePathLabel,cc.xy(2,2));
-
-      _jreMinLabel.setName("jreMinLabel");
-      _jreMinLabel.setText(Messages.getString("jreMin"));
-      jpanel1.add(_jreMinLabel,cc.xy(2,6));
-
-      _jreMaxLabel.setName("jreMaxLabel");
-      _jreMaxLabel.setText(Messages.getString("jreMax"));
-      jpanel1.add(_jreMaxLabel,cc.xy(2,8));
-
-      _jvmOptionsTextLabel.setName("jvmOptionsTextLabel");
-      _jvmOptionsTextLabel.setText(Messages.getString("jvmOptions"));
-      jpanel1.add(_jvmOptionsTextLabel,new CellConstraints(2,16,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      _jreMinField.setName("jreMinField");
-      jpanel1.add(_jreMinField,cc.xy(4,6));
-
-      _jreMaxField.setName("jreMaxField");
-      jpanel1.add(_jreMaxField,cc.xy(4,8));
-
-      _jvmOptionsTextArea.setName("jvmOptionsTextArea");
-      _jvmOptionsTextArea.setToolTipText(Messages.getString("jvmOptionsTip"));
-      JScrollPane jscrollpane1 = new JScrollPane();
-      jscrollpane1.setViewportView(_jvmOptionsTextArea);
-      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane1,cc.xywh(4,16,7,1));
-
-      _initialHeapSizeLabel.setName("initialHeapSizeLabel");
-      _initialHeapSizeLabel.setText(Messages.getString("initialHeapSize"));
-      jpanel1.add(_initialHeapSizeLabel,cc.xy(2,12));
-
-      _maxHeapSizeLabel.setName("maxHeapSizeLabel");
-      _maxHeapSizeLabel.setText(Messages.getString("maxHeapSize"));
-      jpanel1.add(_maxHeapSizeLabel,cc.xy(2,14));
-
-      JLabel jlabel1 = new JLabel();
-      jlabel1.setText("MB");
-      jpanel1.add(jlabel1,cc.xy(6,12));
-
-      JLabel jlabel2 = new JLabel();
-      jlabel2.setText("MB");
-      jpanel1.add(jlabel2,cc.xy(6,14));
-
-      _initialHeapSizeField.setName("initialHeapSizeField");
-      jpanel1.add(_initialHeapSizeField,cc.xy(4,12));
-
-      _maxHeapSizeField.setName("maxHeapSizeField");
-      jpanel1.add(_maxHeapSizeField,cc.xy(4,14));
-
-      _maxHeapPercentField.setName("maxHeapPercentField");
-      jpanel1.add(_maxHeapPercentField,cc.xy(8,14));
-
-      _initialHeapPercentField.setName("initialHeapPercentField");
-      jpanel1.add(_initialHeapPercentField,cc.xy(8,12));
-
-      _jdkPreferenceCombo.setName("jdkPreferenceCombo");
-      jpanel1.add(_jdkPreferenceCombo,cc.xywh(8,6,3,1));
-
-      JLabel jlabel3 = new JLabel();
-      jlabel3.setText(Messages.getString("availableMemory"));
-      jpanel1.add(jlabel3,cc.xy(10,12));
-
-      JLabel jlabel4 = new JLabel();
-      jlabel4.setText(Messages.getString("availableMemory"));
-      jpanel1.add(jlabel4,cc.xy(10,14));
-
-      _runtimeBitsCombo.setName("runtimeBitsCombo");
-      _runtimeBitsCombo.setToolTipText("");
-      jpanel1.add(_runtimeBitsCombo,cc.xywh(8,8,3,1));
-
-      jpanel1.add(createPanel1(),cc.xywh(2,18,9,1));
-      TitledSeparator titledseparator1 = new TitledSeparator();
-      titledseparator1.setText(Messages.getString("searchOptions"));
-      jpanel1.add(titledseparator1,cc.xywh(2,4,9,1));
-
-      TitledSeparator titledseparator2 = new TitledSeparator();
-      titledseparator2.setText(Messages.getString("options"));
-      jpanel1.add(titledseparator2,cc.xywh(2,10,9,1));
-
-      jpanel1.add(createPanel2(),cc.xywh(4,2,7,1));
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8,9,10,11 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19 });
-      return jpanel1;
-   }
-
-   public JPanel createPanel1()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:3DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _varCombo.setName("varCombo");
-      jpanel1.add(_varCombo,cc.xy(3,1));
-
-      _propertyButton.setActionCommand("Add");
-      _propertyButton.setIcon(loadImage("images/edit_add16.png"));
-      _propertyButton.setName("propertyButton");
-      _propertyButton.setText(Messages.getString("property"));
-      _propertyButton.setToolTipText(Messages.getString("propertyTip"));
-      jpanel1.add(_propertyButton,cc.xy(5,1));
-
-      _optionButton.setActionCommand("Add");
-      _optionButton.setIcon(loadImage("images/edit_add16.png"));
-      _optionButton.setName("optionButton");
-      _optionButton.setText(Messages.getString("option"));
-      _optionButton.setToolTipText(Messages.getString("optionTip"));
-      jpanel1.add(_optionButton,cc.xy(7,1));
-
-      _envPropertyButton.setActionCommand("Add");
-      _envPropertyButton.setIcon(loadImage("images/edit_add16.png"));
-      _envPropertyButton.setName("envPropertyButton");
-      _envPropertyButton.setText(Messages.getString("property"));
-      _envPropertyButton.setToolTipText(Messages.getString("propertyTip"));
-      jpanel1.add(_envPropertyButton,cc.xy(5,3));
-
-      JLabel jlabel1 = new JLabel();
-      jlabel1.setText(Messages.getString("varsAndRegistry"));
-      jpanel1.add(jlabel1,cc.xy(1,1));
-
-      JLabel jlabel2 = new JLabel();
-      jlabel2.setIcon(loadImage("images/asterix.gif"));
-      jlabel2.setText(Messages.getString("envVar"));
-      jpanel1.add(jlabel2,cc.xy(1,3));
-
-      _envOptionButton.setActionCommand("Add");
-      _envOptionButton.setIcon(loadImage("images/edit_add16.png"));
-      _envOptionButton.setName("envOptionButton");
-      _envOptionButton.setText(Messages.getString("option"));
-      _envOptionButton.setToolTipText(Messages.getString("optionTip"));
-      jpanel1.add(_envOptionButton,cc.xy(7,3));
-
-      _envVarField.setName("envVarField");
-      jpanel1.add(_envVarField,cc.xy(3,3));
-
-      addFillComponents(jpanel1,new int[]{ 2,4,6 },new int[]{ 2 });
-      return jpanel1;
-   }
-
-   public JPanel createPanel2()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:3DLU:NONE,FILL:DEFAULT:NONE,FILL:3DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _jrePathField.setName("jrePathField");
-      _jrePathField.setToolTipText(Messages.getString("jrePathTip"));
-      jpanel1.add(_jrePathField,cc.xy(1,1));
-
-      _bundledJre64BitCheck.setActionCommand(Messages.getString("bundledJre64Bit"));
-      _bundledJre64BitCheck.setName("bundledJre64BitCheck");
-      _bundledJre64BitCheck.setText(Messages.getString("bundledJre64Bit"));
-      _bundledJre64BitCheck.setToolTipText(Messages.getString("bundledJre64BitTip"));
-      jpanel1.add(_bundledJre64BitCheck,cc.xy(3,1));
-
-      _bundledJreAsFallbackCheck.setActionCommand(Messages.getString("bundledJreAsFallback"));
-      _bundledJreAsFallbackCheck.setName("bundledJreAsFallbackCheck");
-      _bundledJreAsFallbackCheck.setText(Messages.getString("bundledJreAsFallback"));
-      _bundledJreAsFallbackCheck.setToolTipText(Messages.getString("bundledJreAsFallbackTip"));
-      jpanel1.add(_bundledJreAsFallbackCheck,cc.xy(5,1));
-
-      addFillComponents(jpanel1,new int[]{ 2,4 },new int[0]);
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/JreForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/JreForm.jfrm
deleted file mode 100644
index ffb56c9..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/JreForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/Messages.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/Messages.java
deleted file mode 100644
index d995a22..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/Messages.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j.form;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-class Messages {
-	private static final String BUNDLE_NAME = "net.sf.launch4j.form.messages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/MessagesForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/MessagesForm.java
deleted file mode 100644
index f2e8723..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/MessagesForm.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-public abstract class MessagesForm extends JPanel
-{
-   protected final JTextArea _startupErrTextArea = new JTextArea();
-   protected final JTextArea _bundledJreErrTextArea = new JTextArea();
-   protected final JTextArea _jreVersionErrTextArea = new JTextArea();
-   protected final JTextArea _launcherErrTextArea = new JTextArea();
-   protected final JCheckBox _messagesCheck = new JCheckBox();
-   protected final JTextArea _instanceAlreadyExistsMsgTextArea = new JTextArea();
-
-   /**
-    * Default constructor
-    */
-   public MessagesForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:3DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:3DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:3DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:3DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:9DLU:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _startupErrTextArea.setName("startupErrTextArea");
-      JScrollPane jscrollpane1 = new JScrollPane();
-      jscrollpane1.setViewportView(_startupErrTextArea);
-      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane1,cc.xy(4,4));
-
-      _bundledJreErrTextArea.setName("bundledJreErrTextArea");
-      JScrollPane jscrollpane2 = new JScrollPane();
-      jscrollpane2.setViewportView(_bundledJreErrTextArea);
-      jscrollpane2.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane2.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane2,cc.xy(4,6));
-
-      _jreVersionErrTextArea.setName("jreVersionErrTextArea");
-      _jreVersionErrTextArea.setToolTipText(Messages.getString("jreVersionErrTip"));
-      JScrollPane jscrollpane3 = new JScrollPane();
-      jscrollpane3.setViewportView(_jreVersionErrTextArea);
-      jscrollpane3.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane3.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane3,cc.xy(4,8));
-
-      _launcherErrTextArea.setName("launcherErrTextArea");
-      JScrollPane jscrollpane4 = new JScrollPane();
-      jscrollpane4.setViewportView(_launcherErrTextArea);
-      jscrollpane4.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane4.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane4,cc.xy(4,10));
-
-      JLabel jlabel1 = new JLabel();
-      jlabel1.setText(Messages.getString("startupErr"));
-      jpanel1.add(jlabel1,new CellConstraints(2,4,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      JLabel jlabel2 = new JLabel();
-      jlabel2.setText(Messages.getString("bundledJreErr"));
-      jpanel1.add(jlabel2,new CellConstraints(2,6,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      JLabel jlabel3 = new JLabel();
-      jlabel3.setText(Messages.getString("jreVersionErr"));
-      jpanel1.add(jlabel3,new CellConstraints(2,8,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      JLabel jlabel4 = new JLabel();
-      jlabel4.setText(Messages.getString("launcherErr"));
-      jpanel1.add(jlabel4,new CellConstraints(2,10,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      _messagesCheck.setActionCommand("Add version information");
-      _messagesCheck.setName("messagesCheck");
-      _messagesCheck.setText(Messages.getString("addMessages"));
-      jpanel1.add(_messagesCheck,cc.xy(4,2));
-
-      JLabel jlabel5 = new JLabel();
-      jlabel5.setText(Messages.getString("instanceAlreadyExistsMsg"));
-      jpanel1.add(jlabel5,new CellConstraints(2,12,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
-
-      _instanceAlreadyExistsMsgTextArea.setName("instanceAlreadyExistsMsgTextArea");
-      _instanceAlreadyExistsMsgTextArea.setToolTipText(Messages.getString("instanceAlreadyExistsMsgTip"));
-      JScrollPane jscrollpane5 = new JScrollPane();
-      jscrollpane5.setViewportView(_instanceAlreadyExistsMsgTextArea);
-      jscrollpane5.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-      jscrollpane5.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-      jpanel1.add(jscrollpane5,cc.xy(4,12));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/MessagesForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/MessagesForm.jfrm
deleted file mode 100644
index e8044df..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/MessagesForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SingleInstanceForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SingleInstanceForm.java
deleted file mode 100644
index 2bfe724..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SingleInstanceForm.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-public abstract class SingleInstanceForm extends JPanel
-{
-   protected final JLabel _splashFileLabel = new JLabel();
-   protected final JTextField _mutexNameField = new JTextField();
-   protected final JCheckBox _singleInstanceCheck = new JCheckBox();
-   protected final JTextField _windowTitleField = new JTextField();
-   protected final JLabel _splashFileLabel1 = new JLabel();
-
-   /**
-    * Default constructor
-    */
-   public SingleInstanceForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:60DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:9DLU:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _splashFileLabel.setIcon(loadImage("images/asterix.gif"));
-      _splashFileLabel.setName("splashFileLabel");
-      _splashFileLabel.setText(Messages.getString("mutexName"));
-      jpanel1.add(_splashFileLabel,cc.xy(2,4));
-
-      _mutexNameField.setName("mutexNameField");
-      _mutexNameField.setToolTipText(Messages.getString("mutexNameTip"));
-      jpanel1.add(_mutexNameField,cc.xywh(4,4,2,1));
-
-      _singleInstanceCheck.setActionCommand("Enable splash screen");
-      _singleInstanceCheck.setName("singleInstanceCheck");
-      _singleInstanceCheck.setText(Messages.getString("enableSingleInstance"));
-      jpanel1.add(_singleInstanceCheck,cc.xywh(4,2,2,1));
-
-      _windowTitleField.setName("windowTitleField");
-      _windowTitleField.setToolTipText(Messages.getString("windowTitleTip"));
-      jpanel1.add(_windowTitleField,cc.xywh(4,6,2,1));
-
-      _splashFileLabel1.setName("splashFileLabel");
-      _splashFileLabel1.setText(Messages.getString("windowTitle"));
-      jpanel1.add(_splashFileLabel1,cc.xy(2,6));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6 },new int[]{ 1,2,3,4,5,6,7 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SingleInstanceForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SingleInstanceForm.jfrm
deleted file mode 100644
index c9d7ce2..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SingleInstanceForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SplashForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SplashForm.java
deleted file mode 100644
index 7a3085a..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SplashForm.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-public abstract class SplashForm extends JPanel
-{
-   protected final JLabel _splashFileLabel = new JLabel();
-   protected final JLabel _waitForWindowLabel = new JLabel();
-   protected final JLabel _timeoutLabel = new JLabel();
-   protected final JCheckBox _timeoutErrCheck = new JCheckBox();
-   protected final JTextField _splashFileField = new JTextField();
-   protected final JTextField _timeoutField = new JTextField();
-   protected final JButton _splashFileButton = new JButton();
-   protected final JCheckBox _splashCheck = new JCheckBox();
-   protected final JCheckBox _waitForWindowCheck = new JCheckBox();
-
-   /**
-    * Default constructor
-    */
-   public SplashForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:60DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:3DLU:NONE,FILL:26PX:NONE,FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:9DLU:NONE");
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _splashFileLabel.setIcon(loadImage("images/asterix.gif"));
-      _splashFileLabel.setName("splashFileLabel");
-      _splashFileLabel.setText(Messages.getString("splashFile"));
-      jpanel1.add(_splashFileLabel,cc.xy(2,4));
-
-      _waitForWindowLabel.setName("waitForWindowLabel");
-      _waitForWindowLabel.setText(Messages.getString("waitForWindow"));
-      jpanel1.add(_waitForWindowLabel,cc.xy(2,6));
-
-      _timeoutLabel.setIcon(loadImage("images/asterix.gif"));
-      _timeoutLabel.setName("timeoutLabel");
-      _timeoutLabel.setText(Messages.getString("timeout"));
-      jpanel1.add(_timeoutLabel,cc.xy(2,8));
-
-      _timeoutErrCheck.setActionCommand("Signal error on timeout");
-      _timeoutErrCheck.setName("timeoutErrCheck");
-      _timeoutErrCheck.setText(Messages.getString("timeoutErr"));
-      _timeoutErrCheck.setToolTipText(Messages.getString("timeoutErrTip"));
-      jpanel1.add(_timeoutErrCheck,cc.xywh(4,10,2,1));
-
-      _splashFileField.setName("splashFileField");
-      _splashFileField.setToolTipText(Messages.getString("splashFileTip"));
-      jpanel1.add(_splashFileField,cc.xywh(4,4,2,1));
-
-      _timeoutField.setName("timeoutField");
-      _timeoutField.setToolTipText(Messages.getString("timeoutTip"));
-      jpanel1.add(_timeoutField,cc.xy(4,8));
-
-      _splashFileButton.setIcon(loadImage("images/open16.png"));
-      _splashFileButton.setName("splashFileButton");
-      jpanel1.add(_splashFileButton,cc.xy(7,4));
-
-      _splashCheck.setActionCommand("Enable splash screen");
-      _splashCheck.setName("splashCheck");
-      _splashCheck.setText(Messages.getString("enableSplash"));
-      jpanel1.add(_splashCheck,cc.xywh(4,2,2,1));
-
-      _waitForWindowCheck.setActionCommand("Close splash screen when an application window appears");
-      _waitForWindowCheck.setName("waitForWindowCheck");
-      _waitForWindowCheck.setText(Messages.getString("waitForWindowText"));
-      jpanel1.add(_waitForWindowCheck,cc.xywh(4,6,2,1));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SplashForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SplashForm.jfrm
deleted file mode 100644
index 114f0e3..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/SplashForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/VersionInfoForm.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/VersionInfoForm.java
deleted file mode 100644
index f1f3c7e..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/VersionInfoForm.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package net.sf.launch4j.form;
-
-import com.jeta.forms.components.separator.TitledSeparator;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.ImageIcon;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-public abstract class VersionInfoForm extends JPanel
-{
-   protected final JCheckBox _versionInfoCheck = new JCheckBox();
-   protected final JLabel _fileVersionLabel = new JLabel();
-   protected final JTextField _fileVersionField = new JTextField();
-   protected final TitledSeparator _addVersionInfoSeparator = new TitledSeparator();
-   protected final JLabel _productVersionLabel = new JLabel();
-   protected final JTextField _productVersionField = new JTextField();
-   protected final JLabel _fileDescriptionLabel = new JLabel();
-   protected final JTextField _fileDescriptionField = new JTextField();
-   protected final JLabel _copyrightLabel = new JLabel();
-   protected final JTextField _copyrightField = new JTextField();
-   protected final JLabel _txtFileVersionLabel = new JLabel();
-   protected final JTextField _txtFileVersionField = new JTextField();
-   protected final JLabel _txtProductVersionLabel = new JLabel();
-   protected final JTextField _txtProductVersionField = new JTextField();
-   protected final JLabel _productNameLabel = new JLabel();
-   protected final JTextField _productNameField = new JTextField();
-   protected final JLabel _originalFilenameLabel = new JLabel();
-   protected final JTextField _originalFilenameField = new JTextField();
-   protected final JLabel _internalNameLabel = new JLabel();
-   protected final JTextField _internalNameField = new JTextField();
-   protected final JLabel _companyNameLabel = new JLabel();
-   protected final JTextField _companyNameField = new JTextField();
-
-   /**
-    * Default constructor
-    */
-   public VersionInfoForm()
-   {
-      initializePanel();
-   }
-
-   /**
-    * Adds fill components to empty cells in the first row and first column of the grid.
-    * This ensures that the grid spacing will be the same as shown in the designer.
-    * @param cols an array of column indices in the first row where fill components should be added.
-    * @param rows an array of row indices in the first column where fill components should be added.
-    */
-   void addFillComponents( Container panel, int[] cols, int[] rows )
-   {
-      Dimension filler = new Dimension(10,10);
-
-      boolean filled_cell_11 = false;
-      CellConstraints cc = new CellConstraints();
-      if ( cols.length > 0 && rows.length > 0 )
-      {
-         if ( cols[0] == 1 && rows[0] == 1 )
-         {
-            /** add a rigid area  */
-            panel.add( Box.createRigidArea( filler ), cc.xy(1,1) );
-            filled_cell_11 = true;
-         }
-      }
-
-      for( int index = 0; index < cols.length; index++ )
-      {
-         if ( cols[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(cols[index],1) );
-      }
-
-      for( int index = 0; index < rows.length; index++ )
-      {
-         if ( rows[index] == 1 && filled_cell_11 )
-         {
-            continue;
-         }
-         panel.add( Box.createRigidArea( filler ), cc.xy(1,rows[index]) );
-      }
-
-   }
-
-   /**
-    * Helper method to load an image file from the CLASSPATH
-    * @param imageName the package and name of the file to load relative to the CLASSPATH
-    * @return an ImageIcon instance with the specified image file
-    * @throws IllegalArgumentException if the image resource cannot be loaded.
-    */
-   public ImageIcon loadImage( String imageName )
-   {
-      try
-      {
-         ClassLoader classloader = getClass().getClassLoader();
-         java.net.URL url = classloader.getResource( imageName );
-         if ( url != null )
-         {
-            ImageIcon icon = new ImageIcon( url );
-            return icon;
-         }
-      }
-      catch( Exception e )
-      {
-         e.printStackTrace();
-      }
-      throw new IllegalArgumentException( "Unable to load image: " + imageName );
-   }
-
-   public JPanel createPanel()
-   {
-      JPanel jpanel1 = new JPanel();
-      FormLayout formlayout1 = new FormLayout("FILL:7DLU:NONE,RIGHT:MAX(65DLU;DEFAULT):NONE,FILL:3DLU:NONE,FILL:60DLU:NONE,FILL:7DLU:NONE,RIGHT:DEFAULT:NONE,FILL:3DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:7DLU:NONE","CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:9DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3DLU:NONE,CENT [...]
-      CellConstraints cc = new CellConstraints();
-      jpanel1.setLayout(formlayout1);
-
-      _versionInfoCheck.setActionCommand("Add version information");
-      _versionInfoCheck.setName("versionInfoCheck");
-      _versionInfoCheck.setText(Messages.getString("addVersionInfo"));
-      jpanel1.add(_versionInfoCheck,cc.xywh(4,2,5,1));
-
-      _fileVersionLabel.setIcon(loadImage("images/asterix.gif"));
-      _fileVersionLabel.setName("fileVersionLabel");
-      _fileVersionLabel.setText(Messages.getString("fileVersion"));
-      jpanel1.add(_fileVersionLabel,cc.xy(2,4));
-
-      _fileVersionField.setName("fileVersionField");
-      _fileVersionField.setToolTipText(Messages.getString("fileVersionTip"));
-      jpanel1.add(_fileVersionField,cc.xy(4,4));
-
-      _addVersionInfoSeparator.setName("addVersionInfoSeparator");
-      _addVersionInfoSeparator.setText("Additional information");
-      jpanel1.add(_addVersionInfoSeparator,cc.xywh(2,10,7,1));
-
-      _productVersionLabel.setIcon(loadImage("images/asterix.gif"));
-      _productVersionLabel.setName("productVersionLabel");
-      _productVersionLabel.setText(Messages.getString("productVersion"));
-      jpanel1.add(_productVersionLabel,cc.xy(2,12));
-
-      _productVersionField.setName("productVersionField");
-      _productVersionField.setToolTipText(Messages.getString("productVersionTip"));
-      jpanel1.add(_productVersionField,cc.xy(4,12));
-
-      _fileDescriptionLabel.setIcon(loadImage("images/asterix.gif"));
-      _fileDescriptionLabel.setName("fileDescriptionLabel");
-      _fileDescriptionLabel.setText(Messages.getString("fileDescription"));
-      jpanel1.add(_fileDescriptionLabel,cc.xy(2,6));
-
-      _fileDescriptionField.setName("fileDescriptionField");
-      _fileDescriptionField.setToolTipText(Messages.getString("fileDescriptionTip"));
-      jpanel1.add(_fileDescriptionField,cc.xywh(4,6,5,1));
-
-      _copyrightLabel.setIcon(loadImage("images/asterix.gif"));
-      _copyrightLabel.setName("copyrightLabel");
-      _copyrightLabel.setText(Messages.getString("copyright"));
-      jpanel1.add(_copyrightLabel,cc.xy(2,8));
-
-      _copyrightField.setName("copyrightField");
-      jpanel1.add(_copyrightField,cc.xywh(4,8,5,1));
-
-      _txtFileVersionLabel.setIcon(loadImage("images/asterix.gif"));
-      _txtFileVersionLabel.setName("txtFileVersionLabel");
-      _txtFileVersionLabel.setText(Messages.getString("txtFileVersion"));
-      jpanel1.add(_txtFileVersionLabel,cc.xy(6,4));
-
-      _txtFileVersionField.setName("txtFileVersionField");
-      _txtFileVersionField.setToolTipText(Messages.getString("txtFileVersionTip"));
-      jpanel1.add(_txtFileVersionField,cc.xy(8,4));
-
-      _txtProductVersionLabel.setIcon(loadImage("images/asterix.gif"));
-      _txtProductVersionLabel.setName("txtProductVersionLabel");
-      _txtProductVersionLabel.setText(Messages.getString("txtProductVersion"));
-      jpanel1.add(_txtProductVersionLabel,cc.xy(6,12));
-
-      _txtProductVersionField.setName("txtProductVersionField");
-      _txtProductVersionField.setToolTipText(Messages.getString("txtProductVersionTip"));
-      jpanel1.add(_txtProductVersionField,cc.xy(8,12));
-
-      _productNameLabel.setIcon(loadImage("images/asterix.gif"));
-      _productNameLabel.setName("productNameLabel");
-      _productNameLabel.setText(Messages.getString("productName"));
-      jpanel1.add(_productNameLabel,cc.xy(2,14));
-
-      _productNameField.setName("productNameField");
-      jpanel1.add(_productNameField,cc.xywh(4,14,5,1));
-
-      _originalFilenameLabel.setIcon(loadImage("images/asterix.gif"));
-      _originalFilenameLabel.setName("originalFilenameLabel");
-      _originalFilenameLabel.setText(Messages.getString("originalFilename"));
-      jpanel1.add(_originalFilenameLabel,cc.xy(2,20));
-
-      _originalFilenameField.setName("originalFilenameField");
-      _originalFilenameField.setToolTipText(Messages.getString("originalFilenameTip"));
-      jpanel1.add(_originalFilenameField,cc.xywh(4,20,5,1));
-
-      _internalNameLabel.setIcon(loadImage("images/asterix.gif"));
-      _internalNameLabel.setName("internalNameLabel");
-      _internalNameLabel.setText(Messages.getString("internalName"));
-      jpanel1.add(_internalNameLabel,cc.xy(2,18));
-
-      _internalNameField.setName("internalNameField");
-      _internalNameField.setToolTipText(Messages.getString("internalNameTip"));
-      jpanel1.add(_internalNameField,cc.xywh(4,18,5,1));
-
-      _companyNameLabel.setName("companyNameLabel");
-      _companyNameLabel.setText(Messages.getString("companyName"));
-      jpanel1.add(_companyNameLabel,cc.xy(2,16));
-
-      _companyNameField.setName("companyNameField");
-      jpanel1.add(_companyNameField,cc.xywh(4,16,5,1));
-
-      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8,9 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21 });
-      return jpanel1;
-   }
-
-   /**
-    * Initializer
-    */
-   protected void initializePanel()
-   {
-      setLayout(new BorderLayout());
-      add(createPanel(), BorderLayout.CENTER);
-   }
-
-
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/VersionInfoForm.jfrm b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/VersionInfoForm.jfrm
deleted file mode 100644
index 32eb136..0000000
Binary files a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/VersionInfoForm.jfrm and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/messages.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/messages.properties
deleted file mode 100644
index ad4fb5b..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/messages.properties
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2015 Grzegorz Kowal
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-log=Log
-
-outfile=Output file:
-outfileTip=Output executable file.
-stayAlive=Stay alive after launching a GUI application
-restartOnCrash=Restart the application after a crash
-restartOnCrashToolTip=When the application exits, any exit code other than 0 is considered a crash and the application will be started again
-manifest=Wrapper manifest:
-manifestTip=Wrapper manifest for User Account Control.
-icon=Icon:
-iconTip=Application icon.
-jar=Jar:
-jarTip=Application jar.
-dontWrapJar=Dont't wrap the jar, launch only
-cmdLine=Command line args:
-cmdLineTip=Constant command line arguments passed to the application.
-options=Options:
-chdir=Change dir:
-chdirTip=Change current directory to a location relative to the executable. Empty field has no effect, . - changes directory to the exe location.
-priority=Process priority:
-normalPriority=Normal
-idlePriority=Idle
-highPriority=High
-downloadAndSupport=Java download and support
-errorTitle=Error title:
-errorTitleTip=Launch4j signals errors using a message box, you can set it's title to the application's name.
-downloadUrl=Java download URL:
-supportUrl=Support URL:
-
-new=New
-accept=Accept
-remove=Remove
-customClassPath=Custom classpath
-classPath=Classpath:
-mainClass=Main class:
-editClassPath=Edit item:
-importClassPath=Import attributes from a jar's manifest.
-
-headerType=Header type:
-gui=GUI
-console=Console
-objectFiles=Object files:
-libs=w32api:
-linkerOptions=Custom header - linker options
-
-enableSingleInstance=Allow only a single instance of the application
-mutexName=Mutex name
-mutexNameTip=Mutex name that will uniquely identify your application.
-windowTitle=Window title
-windowTitleTip=Title of the GUI application window to bring up on attempt to start a next instance.
-
-jrePath=Bundled JRE path:
-jrePathTip=Bundled JRE path relative to the executable or absolute.
-bundledJre64Bit=64-bit
-bundledJre64BitTip=The bundled JRE is 64-bit, heap size will not be limited to the 32-bit maximum.
-bundledJreAsFallback=Fallback option
-bundledJreAsFallbackTip=When the fallback option is checked, the bundled JRE will be used only if the min/max search fails. By default the bundled JRE, if specified, is used as first.
-searchOptions=Search options
-options=Options
-jreMin=Min JRE version:
-jreMax=Max JRE version:
-dontUsePrivateJres=Don't use private JREs
-jvmOptions=JVM options:
-jvmOptionsTip=Accepts everything you would normally pass to java/javaw launcher: assertion options, system properties and X options.
-initialHeapSize=Initial heap size:
-maxHeapSize=Max heap size:
-availableMemory=% of available memory
-addVariables=Add variables:
-addVariablesTip=Add special variable or map environment variables to system properties.
-exeDirVarTip=Executable's runtime directory path.
-exeFileVarTip=Executable's runtime file path (directory and filename).
-varsAndRegistry=Variables / registry:
-envVar=Environment var:
-property=Property
-propertyTip=Map a variable to a system property.
-option=Option
-optionTip=Pass a JVM option using a variable.
-
-setVariables=Set variables:
-
-enableSplash=Enable splash screen
-splashFile=Splash file:
-splashFileTip=Splash screen file in BMP format.
-waitForWindow=Wait for window
-waitForWindowText=Close splash screen when an application window appears
-timeout=Timeout [s]:
-timeoutTip=Number of seconds after which the splash screen must close. Splash timeout may cause an error depending on splashTimeoutErr property.
-timeoutErr=Signal error on timeout
-timeoutErrTip=True signals an error on splash timeout, false closes the splash screen quietly.
-
-version=Version
-additionalInfo=Additional information
-addVersionInfo=Add version information
-fileVersion=File version:
-fileVersionTip=Version number 'x.x.x.x'
-productVersion=Product version:
-productVersionTip=Version number 'x.x.x.x'
-fileDescription=File description:
-fileDescriptionTip=File description presented to the user.
-copyright=Copyright:
-txtFileVersion=Free form:
-txtFileVersionTip=Free form file version, for example '1.20.RC1'.
-txtProductVersion=Free form:
-txtProductVersionTip=Free form product version, for example '1.20.RC1'.
-productName=Product name:
-originalFilename=Original filename:
-originalFilenameTip=Original name of the file without the path. Allows to determine whether a file has been renamed by a user.
-internalName=Internal name:
-internalNameTip=Internal name without extension, original filename or module name for example.
-companyName=Company name:
-
-addMessages=Add custom messages
-startupErr=Startup error:
-bundledJreErr=Bundled JRE error:
-jreVersionErr=JRE version error:
-jreVersionErrTip=Launch4j will append the required version number at the end of this message.
-launcherErr=Launcher error:
-instanceAlreadyExistsMsg=Inst. already exists:
-instanceAlreadyExistsMsgTip=Message displayed by single instance console applications if an instance already exists.
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/messages_es.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/messages_es.properties
deleted file mode 100644
index fa77e0f..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/form/messages_es.properties
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2007 Grzegorz Kowal, Patricio Mart�nez Ros
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-log = Registro
-
-outfile = Fichero de salida
-outfileTip = Fichero ejecutable de salida.
-errorTitle = T\u00EDtulo de error
-errorTitleTip = Launch4j indica los errores usando una ventana de mensaje, usted puede ponerle el nombre de la aplicaci\u00F3n a esta ventana.
-stayAlive = Mantener abierto despu\u00E9s de lanzar una aplicaci\u00F3n GUI
-icon = Icono
-iconTip = Icono de la aplicaci\u00F3n.
-jar = Jar
-jarTip = Jar de la aplicaci\u00F3n.
-dontWrapJar = No empaquetar el jar, s\u00F3lo lanzar
-cmdLine = Argumentos del jar
-cmdLine = Argumentos de l\u00EDnea de \u00F3rdenes pasados a la aplicaci\u00F3n.
-options = Opciones
-chdir = Cambiar al directorio
-chdirTip = Cambia el directorio actual a la localizaci\u00F3n relativa al ejecutable. Si el campo se deja vac\u00EDo, no tiene efecto, . - cambia el directorio a la localizaci\u00F3n del exe.
-headerType = Tipo de cabecera
-gui = GUI
-console = Consola
-objectFiles = Ficheros objeto
-libs = w32api
-linkerOptions = Cabecera personalizada - opciones del enlazador
-jrePath = Ruta del JRE
-jrePathTip = Ruta relativa al ejecutable del JRE.
-jreMin = Versi\u00F3n m\u00EDnima del JRE
-jreMax = Versi\u00F3n m\u00E1xima del JRE
-jvmOptions = Argumentos de la JVM
-jvmOptionsTip = Acepta cualquier argumento que normalmente se le pasar\u00EDa al lanzador java/javaw\: opciones assertion, propiedades de sistema y opciones X.
-initialHeapSize = Tama\u00F1o inicial de la pila
-maxHeapSize = Tama\u00F1o m\u00E1ximo de la pila
-freeMemory=% of free memory
-addVariables = A\u00F1adir variables
-addVariablesTip = A\u00F1adir una variable especial o mapear variables de entorno a las propiedades del sistema.
-exeDirVarTip = Ruta del directorio del ejecutable.
-exeFileVarTip = Ruta del fichero ejecutable (directorio y nombre del fichero).
-other = Otra
-otherTip = Mapear una variable de entorno a una propiedad del sistema.
-otherVarTip = Variable de entorno que mapear.
-add = A\u00F1adir
-specifyVar = Especificar variable de entorno que a\u00F1adir.
-enableSplash = Activar pantalla de bienvenida
-splashFile = Imagen
-splashFileTip = Imagen en formato BMP para la pantalla de bienvenida.
-waitForWindow = Esperar la ventana
-waitForWindowText = Cerrar la pantalla de bienvenida cuando aparezca una ventana de la aplicaci\u00F3n
-timeout = Tiempo de espera [s]
-timeoutTip = Numero de segundos despu\u00E9s de los que la pantalla de bienvenida se debe cerrar. Esta propiedad puede causar provocar un error dependiendo de la propiedad splashTimeoutErr.
-timeoutErr = Se\u00F1al de error asociada al tiempo de espera
-timeoutErrTip = Marcado (true) se\u00F1ala un error despu\u00E9s del tiempo de espera de la pantalla de bienvenida, no marcado (false) cierra la pantalla de bienvenida silenciosamente
-addVersionInfo = A\u00F1ade informaci\u00F3n sobre la versi\u00F3n
-fileVersion = Versi\u00F3n del fichero
-fileVersionTip = N\u00FAmero de versi\u00F3n 'x.x.x.x'
-additionalInfo = Informaci\u00F3n adicional
-productVersion = Versi\u00F3n del producto
-productVersionTip = N\u00FAmero de versi\u00F3n 'x.x.x.x'
-fileDescription = Descripci\u00F3n del fichero
-fileDescriptionTip = Descripci\u00F3n del fichero que se le muestra al usuario.
-copyright = Copyright
-txtFileVersion = Forma libre
-txtFileVersionTip = Forma libre de versi\u00F3n, por ejemplo '1.20.RC1'.
-txtProductVersion = Forma libre
-txtProductVersionTip = Forma libre del producto, por ejemplo '1.20.RC1'.
-productName = Nombre del producto
-originalFilename = Nombre original del fichero
-originalFilenameTip = Nombre original del fichero sin la ruta. Permite determinar si un fichero ha sido renombrado por un usuario.
-internalName = Nombre interno
-internalNameTip = Nombre interno sin extensi\u00F3n, el nombre original del fichero o el m\u00F3dulo, por ejemplo.
-companyName = Nombre de la organizaci\u00F3n
-
-addMessages=Add custom messages
-startupErr=Startup error:
-bundledJreErr=Bundled JRE error:
-jreVersionErr=JRE version error:
-jreVersionErrTip=Launch4j will append the required version number at the end of this message.
-launcherErr=Launcher error:
-instanceAlreadyExistsMsg=Inst. already exists:
-instanceAlreadyExistsMsgTip=Message displayed by single instance console applications if an instance already exists.
-
-enableSingleInstance=Allow only a single instance of the application
-mutexName=Mutex name
-mutexNameTip=Mutex name that will uniquely identify your application.
-windowTitle=Window title
-windowTitleTip=Title of the application window to bring up on attempt to start a next instance.
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/AbstractAcceptListener.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/AbstractAcceptListener.java
deleted file mode 100644
index cbf69d1..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/AbstractAcceptListener.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import java.awt.Color;
-import java.awt.event.ActionListener;
-
-import javax.swing.JTextField;
-
-import net.sf.launch4j.binding.Binding;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public abstract class AbstractAcceptListener implements ActionListener {
-	final JTextField _field;
-
-	public AbstractAcceptListener(JTextField f, boolean listen) {
-		_field = f;
-		if (listen) {
-			_field.addActionListener(this);
-		}
-	}
-
-	protected String getText() {
-		return _field.getText();
-	}
-	
-	protected void clear() {
-		_field.setText("");
-		_field.requestFocusInWindow();
-	}
-
-	protected void signalViolation(String msg) {
-		final Color bg = _field.getBackground();
-		_field.setBackground(Binding.INVALID_COLOR);
-		MainFrame.getInstance().warn(msg);
-		_field.setBackground(bg);
-		_field.requestFocusInWindow();
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/BasicFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/BasicFormImpl.java
deleted file mode 100644
index 6488aaf..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/BasicFormImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import javax.swing.JFileChooser;
-import javax.swing.JRadioButton;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import net.sf.launch4j.FileChooserFilter;
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.config.Config;
-import net.sf.launch4j.form.BasicForm;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class BasicFormImpl extends BasicForm {
-
-	public BasicFormImpl(Bindings bindings, JFileChooser fc) {
-		bindings.add("outfile", _outfileField)
-				.add("dontWrapJar", _dontWrapJarCheck)
-				.add("jar", _jarField)
-				.add("manifest", _manifestField)
-				.add("icon", _iconField)
-				.add("cmdLine", _cmdLineField)
-				.add("errTitle", _errorTitleField)
-				.add("downloadUrl", _downloadUrlField, Config.DOWNLOAD_URL)
-				.add("supportUrl", _supportUrlField)
-				.add("chdir", _chdirField, ".")
-				.add("priorityIndex", new JRadioButton[] { _normalPriorityRadio,
-															_idlePriorityRadio,
-															_highPriorityRadio })
-				.add("stayAlive", _stayAliveCheck)
-				.add("restartOnCrash", _restartOnCrashCheck);
-
-		_dontWrapJarCheck.addChangeListener(new DontWrapJarChangeListener());
-
-		_outfileButton.addActionListener(new BrowseActionListener(true, fc,
-				new FileChooserFilter("Windows executables (.exe)", ".exe"),
-				_outfileField));
-		_jarButton.addActionListener(new BrowseActionListener(false, fc,
-				new FileChooserFilter("Jar files", ".jar"), _jarField));
-		_manifestButton.addActionListener(new BrowseActionListener(false, fc,
-				new FileChooserFilter("Manifest files (.manifest)", ".manifest"),
-				_manifestField));
-		_iconButton.addActionListener(new BrowseActionListener(false, fc,
-				new FileChooserFilter("Icon files (.ico)", ".ico"), _iconField));
-	}
-
-	private class DontWrapJarChangeListener implements ChangeListener {
-
-		public void stateChanged(ChangeEvent e) {
-			boolean dontWrap = _dontWrapJarCheck.isSelected();
-			if (dontWrap)  {
-				_jarLabel.setIcon(loadImage("images/asterix-o.gif"));
-			    _jarLabel.setText(Messages.getString("jarPath"));
-			    _jarField.setToolTipText(Messages.getString("jarPathTip"));
-			} else {
-				_jarLabel.setIcon(loadImage("images/asterix.gif"));
-				_jarLabel.setText(Messages.getString("jar"));
-				_jarField.setToolTipText(Messages.getString("jarTip"));
-			}
-			_jarButton.setEnabled(!dontWrap);
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/BrowseActionListener.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/BrowseActionListener.java
deleted file mode 100644
index 103e954..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/BrowseActionListener.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import javax.swing.JFileChooser;
-import javax.swing.JTextField;
-
-import net.sf.launch4j.FileChooserFilter;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class BrowseActionListener implements ActionListener {
-	private final boolean _save;
-	private final JFileChooser _fileChooser;
-	private final FileChooserFilter _filter;
-	private final JTextField _field;
-
-	public BrowseActionListener(boolean save, JFileChooser fileChooser,
-			FileChooserFilter filter, JTextField field) {
-		_save = save;
-		_fileChooser = fileChooser;
-		_filter = filter;
-		_field = field;
-	}
-
-	public void actionPerformed(ActionEvent e) {
-		if (!_field.isEnabled()) {
-			return;
-		}
-		_fileChooser.setFileFilter(_filter);
-		_fileChooser.setSelectedFile(new File(""));
-		int result = _save
-				? _fileChooser.showSaveDialog(MainFrame.getInstance())
-				: _fileChooser.showOpenDialog(MainFrame.getInstance());
-		if (result == JFileChooser.APPROVE_OPTION) {
-			_field.setText(_fileChooser.getSelectedFile().getPath());
-		}
-		_fileChooser.removeChoosableFileFilter(_filter);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/ClassPathFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/ClassPathFormImpl.java
deleted file mode 100644
index 79c5074..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/ClassPathFormImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.IOException;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-
-import javax.swing.DefaultListModel;
-import javax.swing.JFileChooser;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import net.sf.launch4j.FileChooserFilter;
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.binding.Validator;
-import net.sf.launch4j.config.ClassPath;
-import net.sf.launch4j.form.ClassPathForm;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class ClassPathFormImpl extends ClassPathForm {
-	private final JFileChooser _fileChooser;
-	private final FileChooserFilter _filter
-			= new FileChooserFilter("Executable jar", ".jar");
-
-	public ClassPathFormImpl(Bindings bindings, JFileChooser fc) {
-		bindings.addOptComponent("classPath", ClassPath.class, _classpathCheck)
-				.add("classPath.mainClass", _mainclassField)
-				.add("classPath.paths", _classpathList);
-		_fileChooser = fc;
-
-		ClasspathCheckListener cpl = new ClasspathCheckListener();
-		_classpathCheck.addChangeListener(cpl);
-		cpl.stateChanged(null);
-
-		_classpathList.setModel(new DefaultListModel());
-		_classpathList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-		_classpathList.addListSelectionListener(new ClasspathSelectionListener());
-
-		_newClasspathButton.addActionListener(new NewClasspathListener());
-		_acceptClasspathButton.addActionListener(
-				new AcceptClasspathListener(_classpathField));
-		_removeClasspathButton.addActionListener(new RemoveClasspathListener());
-		_importClasspathButton.addActionListener(new ImportClasspathListener());
-		_classpathUpButton.addActionListener(new MoveUpListener());
-		_classpathDownButton.addActionListener(new MoveDownListener());
-	}
-
-	private class ClasspathCheckListener implements ChangeListener {
-		public void stateChanged(ChangeEvent e) {
-			boolean on = _classpathCheck.isSelected();
-			_importClasspathButton.setEnabled(on);
-			_classpathUpButton.setEnabled(on);
-			_classpathDownButton.setEnabled(on);
-			_classpathField.setEnabled(on);
-			_newClasspathButton.setEnabled(on);
-			_acceptClasspathButton.setEnabled(on);
-			_removeClasspathButton.setEnabled(on);
-		}
-	}
-
-	private class NewClasspathListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			_classpathList.clearSelection();
-			_classpathField.setText("");
-			_classpathField.requestFocusInWindow();
-		}
-	}
-
-	private class AcceptClasspathListener extends AbstractAcceptListener {
-		public AcceptClasspathListener(JTextField f) {
-			super(f, true);
-		}
-
-		public void actionPerformed(ActionEvent e) {
-			String cp = getText();
-			if (Validator.isEmpty(cp)) {
-				signalViolation(Messages.getString("specifyClassPath"));
-				return;
-			}
-			DefaultListModel model = (DefaultListModel) _classpathList.getModel();
-			if (_classpathList.isSelectionEmpty()) {
-				model.addElement(cp);
-				clear();
-			} else {
-				model.setElementAt(cp, _classpathList.getSelectedIndex());
-			}
-		}
-	}
-
-	private class ClasspathSelectionListener implements ListSelectionListener {
-		public void valueChanged(ListSelectionEvent e) {
-			if (e.getValueIsAdjusting()) {
-				return;
-			}
-			if (_classpathList.isSelectionEmpty()) {
-				_classpathField.setText("");
-			} else {
-				_classpathField.setText((String) _classpathList.getSelectedValue());
-			}
-			_classpathField.requestFocusInWindow();
-		}
-	}
-	
-	private class RemoveClasspathListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			if (_classpathList.isSelectionEmpty()
-					|| !MainFrame.getInstance().confirm(
-							Messages.getString("confirmClassPathRemoval"))) {
-				return;
-			}
-			DefaultListModel model = (DefaultListModel) _classpathList.getModel();
-			while (!_classpathList.isSelectionEmpty()) {
-				model.remove(_classpathList.getSelectedIndex());
-			}
-		}
-	}
-	
-	private class MoveUpListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			int x = _classpathList.getSelectedIndex();
-			if (x < 1) {
-				return;
-			}
-			DefaultListModel model = (DefaultListModel) _classpathList.getModel();
-			Object o = model.get(x - 1);
-			model.set(x - 1, model.get(x));
-			model.set(x, o);
-			_classpathList.setSelectedIndex(x - 1);
-		}
-	}
-	
-	private class MoveDownListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			DefaultListModel model = (DefaultListModel) _classpathList.getModel();
-			int x = _classpathList.getSelectedIndex();
-			if (x == -1 || x >= model.getSize() - 1) {
-				return;
-			}
-			Object o = model.get(x + 1);
-			model.set(x + 1, model.get(x));
-			model.set(x, o);
-			_classpathList.setSelectedIndex(x + 1);
-		}
-	}
-
-	private class ImportClasspathListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			try {
-				_fileChooser.setFileFilter(_filter);
-				_fileChooser.setSelectedFile(new File(""));
-				if (_fileChooser.showOpenDialog(MainFrame.getInstance())
-						== JFileChooser.APPROVE_OPTION) {
-					JarFile jar = new JarFile(_fileChooser.getSelectedFile());
-					if (jar.getManifest() == null) {
-						jar.close();
-						MainFrame.getInstance().info(Messages.getString("noManifest"));
-						return;
-					}
-					Attributes attr = jar.getManifest().getMainAttributes();
-					String mainClass = (String) attr.getValue("Main-Class");
-					String classPath = (String) attr.getValue("Class-Path");
-					jar.close();
-					_mainclassField.setText(mainClass != null ? mainClass : "");
-					DefaultListModel model = new DefaultListModel();
-					if (classPath != null) {
-						String[] paths = classPath.split(" ");
-						for (int i = 0; i < paths.length; i++) {
-							model.addElement(paths[i]);
-						}
-					}
-					_classpathList.setModel(model);
-				}
-			} catch (IOException ex) {
-				MainFrame.getInstance().warn(ex.getMessage());
-			}
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/ConfigFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/ConfigFormImpl.java
deleted file mode 100644
index f028d98..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/ConfigFormImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 10, 2005
- */
-package net.sf.launch4j.formimpl;
-
-import javax.swing.BorderFactory;
-import javax.swing.JFileChooser;
-import javax.swing.JTextArea;
-
-import net.sf.launch4j.binding.Binding;
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.binding.IValidatable;
-import net.sf.launch4j.form.ConfigForm;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class ConfigFormImpl extends ConfigForm {
-	private final Bindings _bindings = new Bindings();
-	private final JFileChooser _fileChooser = new FileChooser(ConfigFormImpl.class);
-
-	public ConfigFormImpl() {
-		_tab.setBorder(BorderFactory.createMatteBorder(0, -1, -1, -1, getBackground()));
-		_tab.addTab(Messages.getString("tab.basic"),
-				new BasicFormImpl(_bindings, _fileChooser));
-		_tab.addTab(Messages.getString("tab.classpath"),
-				new ClassPathFormImpl(_bindings, _fileChooser));
-		_tab.addTab(Messages.getString("tab.header"),
-				new HeaderFormImpl(_bindings));
-		_tab.addTab(Messages.getString("tab.singleInstance"),
-				new SingleInstanceFormImpl(_bindings));
-		_tab.addTab(Messages.getString("tab.jre"),
-				new JreFormImpl(_bindings, _fileChooser));
-		_tab.addTab(Messages.getString("tab.envVars"),
-				new EnvironmentVarsFormImpl(_bindings));
-		_tab.addTab(Messages.getString("tab.splash"),
-				new SplashFormImpl(_bindings, _fileChooser));
-		_tab.addTab(Messages.getString("tab.version"),
-				new VersionInfoFormImpl(_bindings, _fileChooser));
-		_tab.addTab(Messages.getString("tab.messages"),
-				new MessagesFormImpl(_bindings));
-	}
-
-	public void clear(IValidatable bean) {
-		_bindings.clear(bean);
-	}
-
-	public void put(IValidatable bean) {
-		_bindings.put(bean);
-	}
-
-	public void get(IValidatable bean) {
-		_bindings.get(bean);
-	}
-	
-	public boolean isModified() {
-		return _bindings.isModified();
-	}
-	
-	public JTextArea getLogTextArea() {
-		return _logTextArea;
-	}
-	
-	public Binding getBinding(String property) {
-		return _bindings.getBinding(property);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/EnvironmentVarsFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/EnvironmentVarsFormImpl.java
deleted file mode 100644
index e2fa1eb..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/EnvironmentVarsFormImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Jun 10, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.form.EnvironmentVarsForm;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class EnvironmentVarsFormImpl extends EnvironmentVarsForm {
-
-	public EnvironmentVarsFormImpl(Bindings bindings) {
-		bindings.add("variables", _envVarsTextArea);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/FileChooser.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/FileChooser.java
deleted file mode 100644
index 6814a37..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/FileChooser.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Jul 19, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import java.io.File;
-import java.util.prefs.Preferences;
-
-import javax.swing.JFileChooser;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class FileChooser extends JFileChooser {
-	private final Preferences _prefs;
-	private final String _key;
-
-	public FileChooser(Class<?> clazz) {
-		_prefs = Preferences.userNodeForPackage(clazz);
-		_key = "currentDir-"
-			+ clazz.getName().substring(clazz.getName().lastIndexOf('.') + 1);
-		String path = _prefs.get(_key, null);
-
-		if (path != null) {
-			setCurrentDirectory(new File(path));
-		}
-	}
-
-	public void approveSelection() {
-		_prefs.put(_key, getCurrentDirectory().getPath());
-		super.approveSelection();
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/GlassPane.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/GlassPane.java
deleted file mode 100644
index 4612674..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/GlassPane.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package net.sf.launch4j.formimpl;
-
-import java.awt.AWTEvent;
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.event.AWTEventListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-
-/**
- * This is the glass pane class that intercepts screen interactions during
- * system busy states.
- * 
- * Based on JavaWorld article by Yexin Chen.
- */
-public class GlassPane extends JComponent implements AWTEventListener {
-	private final Window _window;
-
-	public GlassPane(Window w) {
-		_window = w;
-		addMouseListener(new MouseAdapter() {});
-		addKeyListener(new KeyAdapter() {});
-		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-	}
-
-	/**
-	 * Receives all key events in the AWT and processes the ones that originated
-	 * from the current window with the glass pane.
-	 * 
-	 * @param event
-	 *            the AWTEvent that was fired
-	 */
-	public void eventDispatched(AWTEvent event) {
-		Object source = event.getSource();
-		if (event instanceof KeyEvent
-				&& source instanceof Component) {
-			/*
-			 * If the event originated from the window w/glass pane,
-			 * consume the event.
-			 */
-			if ((SwingUtilities.windowForComponent((Component) source) == _window)) {
-				((KeyEvent) event).consume();
-			}
-		}
-	}
-
-	/**
-	 * Sets the glass pane as visible or invisible. The mouse cursor will be set
-	 * accordingly.
-	 */
-	public void setVisible(boolean visible) {
-		if (visible) {
-			// Start receiving all events and consume them if necessary
-			Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
-		} else {
-			// Stop receiving all events
-			Toolkit.getDefaultToolkit().removeAWTEventListener(this);
-		}
-		super.setVisible(visible);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/HeaderFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/HeaderFormImpl.java
deleted file mode 100644
index d4ca507..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/HeaderFormImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JRadioButton;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import net.sf.launch4j.binding.Binding;
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.config.Config;
-import net.sf.launch4j.config.ConfigPersister;
-import net.sf.launch4j.form.HeaderForm;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class HeaderFormImpl extends HeaderForm {
-	private final Bindings _bindings;
-
-	public HeaderFormImpl(Bindings bindings) {
-		_bindings = bindings;
-		_bindings.add("headerTypeIndex", new JRadioButton[] { _guiHeaderRadio,
-														_consoleHeaderRadio })
-				.add("headerObjects", "customHeaderObjects", _headerObjectsCheck,
-															_headerObjectsTextArea)
-				.add("libs", "customLibs", _libsCheck, _libsTextArea);
-
-		_guiHeaderRadio.addChangeListener(new HeaderTypeChangeListener());
-		_headerObjectsCheck.addActionListener(new HeaderObjectsActionListener());
-		_libsCheck.addActionListener(new LibsActionListener());
-	}
-
-	private class HeaderTypeChangeListener implements ChangeListener {
-		public void stateChanged(ChangeEvent e) {
-			Config c = ConfigPersister.getInstance().getConfig();
-			c.setHeaderType(_guiHeaderRadio.isSelected() ? Config.GUI_HEADER
-														: Config.CONSOLE_HEADER);
-			if (!_headerObjectsCheck.isSelected()) {
-				Binding b = _bindings.getBinding("headerObjects");
-				b.put(c);
-			}
-		}
-	}
-
-	private class HeaderObjectsActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			if (!_headerObjectsCheck.isSelected()) {
-				ConfigPersister.getInstance().getConfig().setHeaderObjects(null);
-				Binding b = _bindings.getBinding("headerObjects");
-				b.put(ConfigPersister.getInstance().getConfig());
-			}
-		}
-	}
-
-	private class LibsActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			if (!_libsCheck.isSelected()) {
-				ConfigPersister.getInstance().getConfig().setLibs(null);
-				Binding b = _bindings.getBinding("libs");
-				b.put(ConfigPersister.getInstance().getConfig());
-			}
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/JreFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/JreFormImpl.java
deleted file mode 100644
index ad25442..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/JreFormImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JFileChooser;
-import javax.swing.JTextField;
-
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.binding.Validator;
-import net.sf.launch4j.form.JreForm;
-import net.sf.launch4j.config.Jre;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class JreFormImpl extends JreForm {
-
-	public JreFormImpl(Bindings bindings, JFileChooser fc) {
-		_jdkPreferenceCombo.setModel(new DefaultComboBoxModel(new String[] {
-				Messages.getString("jdkPreference.jre.only"),
-				Messages.getString("jdkPreference.prefer.jre"),
-				Messages.getString("jdkPreference.prefer.jdk"),
-				Messages.getString("jdkPreference.jdk.only")}));
-
-		_runtimeBitsCombo.setModel(new DefaultComboBoxModel(new String[] {
-				Messages.getString("runtimeBits.64"),
-				Messages.getString("runtimeBits.64And32"),
-				Messages.getString("runtimeBits.32And64"),
-				Messages.getString("runtimeBits.32")}));
-
-		bindings.add("jre.path", _jrePathField)
-				.add("jre.bundledJre64Bit", _bundledJre64BitCheck)
-				.add("jre.bundledJreAsFallback", _bundledJreAsFallbackCheck)
-				.add("jre.minVersion", _jreMinField)
-				.add("jre.maxVersion", _jreMaxField)
-				.add("jre.jdkPreferenceIndex", _jdkPreferenceCombo,	Jre.DEFAULT_JDK_PREFERENCE_INDEX)
-				.add("jre.runtimeBitsIndex", _runtimeBitsCombo, Jre.DEFAULT_JDK_PREFERENCE_INDEX)
-				.add("jre.initialHeapSize", _initialHeapSizeField)
-				.add("jre.initialHeapPercent", _initialHeapPercentField)
-				.add("jre.maxHeapSize", _maxHeapSizeField)
-				.add("jre.maxHeapPercent", _maxHeapPercentField)
-				.add("jre.options", _jvmOptionsTextArea);
-
-		_varCombo.setModel(new DefaultComboBoxModel(new String[] {
-				"EXEDIR", "EXEFILE", "PWD", "OLDPWD", "JREHOMEDIR",
-				"HKEY_CLASSES_ROOT", "HKEY_CURRENT_USER", "HKEY_LOCAL_MACHINE",
-				"HKEY_USERS", "HKEY_CURRENT_CONFIG" }));
-
-		_varCombo.addActionListener(new VarComboActionListener());
-		_varCombo.setSelectedIndex(0);
-
-		_propertyButton.addActionListener(new PropertyActionListener());
-		_optionButton.addActionListener(new OptionActionListener());
-
-		_envPropertyButton.addActionListener(new EnvPropertyActionListener(_envVarField));
-		_envOptionButton.addActionListener(new EnvOptionActionListener(_envVarField));
-	}
-
-	private class VarComboActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			_optionButton.setEnabled(((String) _varCombo.getSelectedItem())
-					.startsWith("HKEY_"));
-		}
-	}
-
-	private class PropertyActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			final int pos = _jvmOptionsTextArea.getCaretPosition();
-			final String var = (String) _varCombo.getSelectedItem();
-			if (var.startsWith("HKEY_")) {
-				_jvmOptionsTextArea.insert("-Dreg.key=\"%"
-						+ var + "\\...%\"\n", pos);
-			} else {
-				_jvmOptionsTextArea.insert("-Dlaunch4j." + var.toLowerCase()
-						+ "=\"%" + var + "%\"\n", pos);
-			}
-		}
-	}
-
-	private class OptionActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			final int pos = _jvmOptionsTextArea.getCaretPosition();
-			final String var = (String) _varCombo.getSelectedItem();
-			if (var.startsWith("HKEY_")) {
-				_jvmOptionsTextArea.insert("%" + var + "\\...%\n", pos);
-			} else {
-				_jvmOptionsTextArea.insert("%" + var + "%\n", pos);
-			}
-		}
-	}
-
-	private abstract class EnvActionListener extends AbstractAcceptListener {
-		public EnvActionListener(JTextField f, boolean listen) {
-			super(f, listen);
-		}
-
-		public void actionPerformed(ActionEvent e) {
-			final int pos = _jvmOptionsTextArea.getCaretPosition();
-			final String var = getText()
-					.replaceAll("\"", "")
-					.replaceAll("%", "");
-			if (Validator.isEmpty(var)) {
-				signalViolation(Messages.getString("specifyVar"));
-				return;
-			}
-			add(var, pos);
-			clear();
-		}
-
-		protected abstract void add(String var, int pos);
-	}
-
-	private class EnvPropertyActionListener extends EnvActionListener {
-		public EnvPropertyActionListener(JTextField f) {
-			super(f, true);
-		}
-
-		protected void add(String var, int pos) {
-			final String prop = var
-					.replaceAll(" ", ".")
-					.replaceAll("_", ".")
-					.toLowerCase();
-			_jvmOptionsTextArea.insert("-Denv." + prop + "=\"%" + var
-					+ "%\"\n", pos);
-		}
-	}
-
-	private class EnvOptionActionListener extends EnvActionListener {
-		public EnvOptionActionListener(JTextField f) {
-			super(f, false);
-		}
-
-		protected void add(String var, int pos) {
-			_jvmOptionsTextArea.insert("%" + var + "%\n", pos);	
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/MainFrame.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/MainFrame.java
deleted file mode 100644
index a25dc7e..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/MainFrame.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on 2005-05-09
- */
-package net.sf.launch4j.formimpl;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JToolBar;
-import javax.swing.UIManager;
-
-import com.jgoodies.looks.Options;
-import com.jgoodies.looks.plastic.PlasticXPLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
-
-import foxtrot.Task;
-import foxtrot.Worker;
-import net.sf.launch4j.Builder;
-import net.sf.launch4j.BuilderException;
-import net.sf.launch4j.ExecException;
-import net.sf.launch4j.FileChooserFilter;
-import net.sf.launch4j.Log;
-import net.sf.launch4j.Main;
-import net.sf.launch4j.Util;
-import net.sf.launch4j.binding.Binding;
-import net.sf.launch4j.binding.BindingException;
-import net.sf.launch4j.binding.InvariantViolationException;
-import net.sf.launch4j.config.Config;
-import net.sf.launch4j.config.ConfigPersister;
-import net.sf.launch4j.config.ConfigPersisterException;
-
-/**
- * @author Copyright (C) 2005 Grzegorz Kowal
- */
-public class MainFrame extends JFrame {
-	private static MainFrame _instance;
-
-	private final JToolBar _toolBar;
-	private final JButton _runButton;
-	private final ConfigFormImpl _configForm;
-	private final JFileChooser _fileChooser = new FileChooser(MainFrame.class);
-	private File _outfile;
-	private boolean _saved = false;
-
-	public static void createInstance() {
-		try {
-			Toolkit.getDefaultToolkit().setDynamicLayout(true);
-			System.setProperty("sun.awt.noerasebackground","true");
-	
-			// JGoodies
-			Options.setDefaultIconSize(new Dimension(16, 16));		// menu icons
-			Options.setUseNarrowButtons(false);
-			Options.setPopupDropShadowEnabled(true);
-
-			UIManager.setLookAndFeel(System.getProperty("os.name").toLowerCase().startsWith("windows")
-					? new WindowsLookAndFeel() : new PlasticXPLookAndFeel());
-
-			_instance = new MainFrame();
-		} catch (Exception e) {
-			System.err.println(e);
-		}
-	}
-
-	public static MainFrame getInstance() {
-		return _instance;
-	}
-
-	public MainFrame() {
-		showConfigName(null);
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-		addWindowListener(new MainFrameListener());
-		setGlassPane(new GlassPane(this));
-		_fileChooser.setFileFilter(new FileChooserFilter(
-				Messages.getString("MainFrame.config.files"),
-				new String[] {".xml", ".cfg"}));
-
-		_toolBar = new JToolBar();
-		_toolBar.setFloatable(false);
-		_toolBar.setRollover(true);
-		addButton("images/new.png",	Messages.getString("MainFrame.new.config"),
-				new NewActionListener());
-		addButton("images/open.png", Messages.getString("MainFrame.open.config"),
-				new OpenActionListener());
-		addButton("images/save.png", Messages.getString("MainFrame.save.config"),
-				new SaveActionListener());
-		_toolBar.addSeparator();
-		addButton("images/build.png", Messages.getString("MainFrame.build.wrapper"),
-				new BuildActionListener());
-		_runButton = addButton("images/run.png",
-				Messages.getString("MainFrame.test.wrapper"),
-				new RunActionListener());
-		setRunEnabled(false);
-		_toolBar.addSeparator();
-		addButton("images/info.png", Messages.getString("MainFrame.about.launch4j"),
-				new AboutActionListener());
-
-		_configForm = new ConfigFormImpl();
-		getContentPane().setLayout(new BorderLayout());
-		getContentPane().add(_toolBar, BorderLayout.NORTH);
-		getContentPane().add(_configForm, BorderLayout.CENTER);
-		pack();
-		Dimension scr = Toolkit.getDefaultToolkit().getScreenSize();
-		Dimension fr = getSize();
-		fr.width += 25;
-		fr.height += 100;
-		setBounds((scr.width - fr.width) / 2, (scr.height - fr.height) / 2,
-				fr.width, fr.height);
-		setVisible(true);
-	}
-
-	private JButton addButton(String iconPath, String tooltip, ActionListener l) {
-		ImageIcon icon = new ImageIcon(MainFrame.class.getClassLoader()
-				.getResource(iconPath));
-		JButton b = new JButton(icon);
-		b.setToolTipText(tooltip);
-		b.addActionListener(l);
-		_toolBar.add(b);
-		return b;
-	}
-	
-	public void info(String text) {
-		JOptionPane.showMessageDialog(this, 
-									text,
-									Main.getName(),
-									JOptionPane.INFORMATION_MESSAGE);
-	}
-
-	public void warn(String text) {
-		JOptionPane.showMessageDialog(this, 
-									text,
-									Main.getName(),
-									JOptionPane.WARNING_MESSAGE);
-	}
-
-	public void warn(InvariantViolationException e) {
-		Binding b = e.getBinding(); 
-		if (b != null) {
-			b.markInvalid();
-		}
-		warn(e.getMessage());
-		if (b != null) {
-			e.getBinding().markValid();
-		}
-	}
-
-	public boolean confirm(String text) {
-		return JOptionPane.showConfirmDialog(MainFrame.this,
-				text,
-				Messages.getString("MainFrame.confirm"),
-				JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
-	}
-
-	private boolean canDiscardChanges() {
-		return (!_configForm.isModified())
-				|| confirm(Messages.getString("MainFrame.discard.changes"));
-	}
-
-	private boolean save() {
-		try {
-			_configForm.get(ConfigPersister.getInstance().getConfig());
-			if (_fileChooser.showSaveDialog(MainFrame.this) == JOptionPane.YES_OPTION) {
-				File f = _fileChooser.getSelectedFile();
-				if (!f.getPath().endsWith(".xml")) {
-					f = new File(f.getPath() + ".xml");
-				}
-				ConfigPersister.getInstance().save(f);
-				_saved = true;
-				showConfigName(f);
-				return true;
-			}
-			return false;
-		} catch (InvariantViolationException ex) {
-			warn(ex);
-			return false;
-		} catch (BindingException ex) {
-			warn(ex.getMessage());
-			return false;
-		} catch (ConfigPersisterException ex) {
-			warn(ex.getMessage());
-			return false;
-		}
-	}
-
-	private void showConfigName(File config) {
-		setTitle(Main.getName() + " - " 	+ (config != null ? config.getName()
-						: Messages.getString("MainFrame.untitled")));
-	}
-
-	private void setRunEnabled(boolean enabled) {
-		if (!enabled) {
-			_outfile = null;
-		}
-		_runButton.setEnabled(enabled);
-	}
-
-	private void clearConfig() {
-		ConfigPersister.getInstance().createBlank();
-		_configForm.clear(ConfigPersister.getInstance().getConfig());
-	}
-
-	private class MainFrameListener extends WindowAdapter {
-		public void windowOpened(WindowEvent e) {
-			clearConfig();
-		}
-
-		public void windowClosing(WindowEvent e) {
-			if (canDiscardChanges()) {
-				dispose();
-				System.exit(0);
-			}
-		}
-	}
-
-	private class NewActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			if (canDiscardChanges()) {
-				clearConfig();
-				_saved = false;
-				showConfigName(null);
-				setRunEnabled(false);
-			}
-		}
-	}
-
-	private class OpenActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			try {
-				if (canDiscardChanges() && _fileChooser.showOpenDialog(MainFrame.this)
-									== JOptionPane.YES_OPTION) {
-					final File f = _fileChooser.getSelectedFile(); 
-					if (f.getPath().endsWith(".xml")) {
-						ConfigPersister.getInstance().load(f);	
-						_saved = true;
-					} else {
-						ConfigPersister.getInstance().loadVersion1(f);
-						_saved = false;
-					}
-					_configForm.put(ConfigPersister.getInstance().getConfig());
-					showConfigName(f);
-					setRunEnabled(false);
-				}
-			} catch (ConfigPersisterException ex) {
-				warn(ex.getMessage());
-			} catch (BindingException ex) {
-				warn(ex.getMessage());
-			}
-		}
-	}
-	
-	private class SaveActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			save();
-		}
-	}
-	
-	private class BuildActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			final Log log = Log.getSwingLog(_configForm.getLogTextArea());
-			try {
-				if ((!_saved || _configForm.isModified())
-						&& !save()) {
-					return;
-				}
-				log.clear();
-				ConfigPersister.getInstance().getConfig().checkInvariants();
-				Builder b = new Builder(log);
-				_outfile = b.build();
-				setRunEnabled(ConfigPersister.getInstance().getConfig()
-						.getHeaderType() == Config.GUI_HEADER	// TODO fix console app test
-						&& (Util.WINDOWS_OS || !ConfigPersister.getInstance()
-												.getConfig().isDontWrapJar()));
-			} catch (InvariantViolationException ex) {
-				setRunEnabled(false);
-				ex.setBinding(_configForm.getBinding(ex.getProperty()));
-				warn(ex);
-			} catch (BuilderException ex) {
-				setRunEnabled(false);
-				log.append(ex.getMessage());
-			}
-		}
-	}
-	
-	private class RunActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			try {
-				getGlassPane().setVisible(true);
-				Worker.post(new Task() {
-					public Object run() throws ExecException {
-						Log log = Log.getSwingLog(_configForm.getLogTextArea());
-						log.clear();
-						String path = _outfile.getPath();
-						if (Util.WINDOWS_OS) {
-							log.append(Messages.getString("MainFrame.executing") + path);
-							Util.exec(new String[] { path, "--l4j-debug" }, log);
-						} else {
-							log.append(Messages.getString("MainFrame.jar.integrity.test")
-									+ path);
-							Util.exec(new String[] { "java", "-jar", path }, log);
-						}
-						return null;
-					}
-				});
-			} catch (Exception ex) {
-				// XXX errors logged by exec
-			} finally {
-				getGlassPane().setVisible(false);
-			}
-		};
-	}
-
-	private class AboutActionListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			info(Main.getDescription());
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/Messages.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/Messages.java
deleted file mode 100644
index d4d045a..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/Messages.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package net.sf.launch4j.formimpl;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "net.sf.launch4j.formimpl.messages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/MessagesFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/MessagesFormImpl.java
deleted file mode 100644
index ad9413d..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/MessagesFormImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on Oct 7, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.config.Msg;
-import net.sf.launch4j.form.MessagesForm;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class MessagesFormImpl extends MessagesForm {
-
-	public MessagesFormImpl(Bindings bindings) {
-		Msg m = new Msg();
-		bindings.addOptComponent("messages", Msg.class, _messagesCheck)
-				.add("messages.startupErr", _startupErrTextArea, 	m.getStartupErr())
-				.add("messages.bundledJreErr", _bundledJreErrTextArea, m.getBundledJreErr())
-				.add("messages.jreVersionErr", _jreVersionErrTextArea, m.getJreVersionErr())
-				.add("messages.launcherErr", _launcherErrTextArea, m.getLauncherErr())
-				.add("messages.instanceAlreadyExistsMsg", _instanceAlreadyExistsMsgTextArea,
-						m.getInstanceAlreadyExistsMsg());
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/SingleInstanceFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/SingleInstanceFormImpl.java
deleted file mode 100644
index 5e6dc40..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/SingleInstanceFormImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
- * Created on 2007-09-22
- */
-package net.sf.launch4j.formimpl;
-
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.config.SingleInstance;
-import net.sf.launch4j.form.SingleInstanceForm;
-
-/**
- * @author Copyright (C) 2007 Grzegorz Kowal
- */
-public class SingleInstanceFormImpl extends SingleInstanceForm {
-
-	public SingleInstanceFormImpl(Bindings bindings) {
-		bindings.addOptComponent("singleInstance", SingleInstance.class,
-								_singleInstanceCheck)
-				.add("singleInstance.mutexName", _mutexNameField)
-				.add("singleInstance.windowTitle", _windowTitleField);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/SplashFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/SplashFormImpl.java
deleted file mode 100644
index b204bfd..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/SplashFormImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import javax.swing.JFileChooser;
-
-import net.sf.launch4j.FileChooserFilter;
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.config.Splash;
-import net.sf.launch4j.form.SplashForm;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class SplashFormImpl extends SplashForm {
-
-	public SplashFormImpl(Bindings bindings, JFileChooser fc) {
-		bindings.addOptComponent("splash", Splash.class, _splashCheck)
-				.add("splash.file", _splashFileField)
-				.add("splash.waitForWindow", _waitForWindowCheck, true)
-				.add("splash.timeout", _timeoutField, "60")
-				.add("splash.timeoutErr", _timeoutErrCheck, true);
-
-		_splashFileButton.addActionListener(new BrowseActionListener(false, fc,
-				new FileChooserFilter("Bitmap files (.bmp)", ".bmp"), _splashFileField));
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/VersionInfoFormImpl.java b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/VersionInfoFormImpl.java
deleted file mode 100644
index 275289e..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/VersionInfoFormImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-	Launch4j (http://launch4j.sourceforge.net/)
-	Cross-platform Java application wrapper for creating Windows native executables.
-
-	Copyright (c) 2004, 2015 Grzegorz Kowal
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification,
-	are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright notice,
-	   this list of conditions and the following disclaimer in the documentation
-	   and/or other materials provided with the distribution.
-	
-	3. Neither the name of the copyright holder nor the names of its contributors
-	   may be used to endorse or promote products derived from this software without
-	   specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- * Created on May 1, 2006
- */
-package net.sf.launch4j.formimpl;
-
-import javax.swing.JFileChooser;
-
-import net.sf.launch4j.binding.Bindings;
-import net.sf.launch4j.config.VersionInfo;
-import net.sf.launch4j.form.VersionInfoForm;
-
-/**
- * @author Copyright (C) 2006 Grzegorz Kowal
- */
-public class VersionInfoFormImpl extends VersionInfoForm {
-
-	public VersionInfoFormImpl(Bindings bindings, JFileChooser fc) {
-		bindings.addOptComponent("versionInfo", VersionInfo.class, _versionInfoCheck)
-				.add("versionInfo.fileVersion", _fileVersionField)
-				.add("versionInfo.productVersion", _productVersionField)
-				.add("versionInfo.fileDescription", _fileDescriptionField)
-				.add("versionInfo.internalName", _internalNameField)
-				.add("versionInfo.originalFilename", _originalFilenameField)
-				.add("versionInfo.productName", _productNameField)
-				.add("versionInfo.txtFileVersion", _txtFileVersionField)
-				.add("versionInfo.txtProductVersion", _txtProductVersionField)
-				.add("versionInfo.companyName", _companyNameField)
-				.add("versionInfo.copyright", _copyrightField);
-	}
-}
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/messages.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/messages.properties
deleted file mode 100644
index 385adbd..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/messages.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2015 Grzegorz Kowal
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-tab.basic=Basic
-tab.classpath=Classpath
-tab.header=Header
-tab.singleInstance=Single instance
-tab.jre=JRE
-tab.envVars=Set env. variables
-tab.splash=Splash
-tab.version=Version Info
-tab.messages=Messages
-
-# Basic
-jar=Jar:
-jarPath=Jar runtime path:
-jarTip=Application jar.
-jarPathTip=Optional runtime path of the jar relative to the executable. For example, if the executable launcher and the application jar named calc.exe and calc.jar are in the same directory, it would be: calc.jar.
-
-# Classpath
-specifyClassPath=Specify classpath item to add.
-confirmClassPathRemoval=Remove selected classpath items?
-noManifest=The selected jar does not have a manifest.
-
-# JRE
-specifyVar=Specify environment variable to add.
-otherVar=Other var
-
-jdkPreference.jre.only=Only use public JREs
-jdkPreference.prefer.jre=Prefer public JRE, but use JDK runtime if newer
-jdkPreference.prefer.jdk=Prefer JDK runtime, but use public JRE if newer
-jdkPreference.jdk.only=Only use private JDK runtimes
-
-runtimeBits.64=64-bit only
-runtimeBits.64And32=First 64-bit, then 32-bit
-runtimeBits.32And64=First 32-bit, then 64-bit
-runtimeBits.32=32-bit only
-
-MainFrame.config.files=launch4j config files (.xml, .cfg)
-MainFrame.new.config=New configuration
-MainFrame.open.config=Open configuration or import 1.x
-MainFrame.save.config=Save configuration
-MainFrame.build.wrapper=Build wrapper
-MainFrame.test.wrapper=Test wrapper
-MainFrame.about.launch4j=About launch4j
-MainFrame.discard.changes=Discard changes?
-MainFrame.confirm=Confirm
-MainFrame.untitled=untitled
-MainFrame.executing=Executing: 
-MainFrame.jar.integrity.test=Jar integrity test, executing: 
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/messages_es.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/messages_es.properties
deleted file mode 100644
index e856f38..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/formimpl/messages_es.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2007 Grzegorz Kowal, Patricio Mart�nez Ros
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-tab.basic = B\u00E1sico
-tab.header = Cabecera
-tab.jre = JRE
-tab.splash = Pantalla de bienvenida
-tab.version = Informaci\u00F3n de la versi\u00F3n
-
-jar = Jar
-jarPath = Ruta del jar
-jarTip = Jar de la aplicaci\u00F3n.
-jarPathTip = Ruta del jar relativa al ejecutable. Por ejemplo, si el lanzador ejecutable y el jar de la aplicaci\u00F3n, llamados calc.exe y calc.jar respectivamente, est\u00E1n en el mismo directorio, ser\u00EDa\: calc.jar.
-
-MainFrame.config.files = Ficheros de configuraci\u00F3n de launch4j (.xml, .cfg)
-MainFrame.new.config = Nueva configuraci\u00F3n
-MainFrame.open.config = Abrir configuraci\u00F3n o importar 1.x
-MainFrame.save.config = Guardar configuraci\u00F3n
-MainFrame.build.wrapper = Construir el empaquetador
-MainFrame.test.wrapper = Comprobar el empaquetador
-MainFrame.about.launch4j = Acerca de launch4j
-MainFrame.discard.changes = \u00BFDescartar cambios?
-MainFrame.confirm = Confirmar
-MainFrame.untitled = Sin nombre
-MainFrame.executing = Ejecutando\: 
-MainFrame.jar.integrity.test = Prueba de integridad jar, ejecutando\: 
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/messages.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/messages.properties
deleted file mode 100644
index 9895ca3..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/messages.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2015 Grzegorz Kowal
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-Main.usage=usage
-
-Builder.compiling.resources=Compiling resources
-Builder.linking=Linking
-Builder.wrapping=Wrapping
-Builder.success=Successfully created 
-Builder.generated.resource.file=Generated resource file...\n
-Builder.line.has.errors=Line {0} has errors...
-
-Util.exec.failed=Exec failed
-Util.tmpdir=Temporary file directory path (launch4j.tmpdir) cannot contain spaces.
-
diff --git a/packaging_tools/windows/launch4j/src/net/sf/launch4j/messages_es.properties b/packaging_tools/windows/launch4j/src/net/sf/launch4j/messages_es.properties
deleted file mode 100644
index 8565cf4..0000000
--- a/packaging_tools/windows/launch4j/src/net/sf/launch4j/messages_es.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#	Launch4j (http://launch4j.sourceforge.net/)
-#	Cross-platform Java application wrapper for creating Windows native executables.
-#
-#	Copyright (c) 2004, 2007 Grzegorz Kowal, Patricio Mart�nez Ros
-#	All rights reserved.
-#
-#	Redistribution and use in source and binary forms, with or without modification,
-#	are permitted provided that the following conditions are met:
-#	
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-#	
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-#	
-#	3. Neither the name of the copyright holder nor the names of its contributors
-#	   may be used to endorse or promote products derived from this software without
-#	   specific prior written permission.
-#	
-#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-#	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-#	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-Main.usage=Uso
-
-Builder.compiling.resources=Compilando recursos
-Builder.linking=Enlazando
-Builder.wrapping=Empaquetando
-Builder.success=Creado con \ufffdxito 
-Builder.generated.resource.file=Fichero de recursos generado...\n
-Builder.line.has.errors=Line {0} has errors...
-
-Util.exec.failed=Fallo en la ejecuci\ufffd
-Util.tmpdir=Temporary file directory path (launch4j.tmpdir) cannot contain spaces.
diff --git a/packaging_tools/windows/launch4j/w32api/MinGW.LICENSE.txt b/packaging_tools/windows/launch4j/w32api/MinGW.LICENSE.txt
deleted file mode 100644
index aea85bd..0000000
--- a/packaging_tools/windows/launch4j/w32api/MinGW.LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-MinGW - Licensing Terms
-
-Various pieces distributed with MinGW come with its own copyright and license:
-
-Basic MinGW runtime
-    MinGW base runtime package is uncopyrighted and placed in the public domain.
-    This basically means that you can do what you want with the code.
-
-w32api
-    You are free to use, modify and copy this package.
-    No restrictions are imposed on programs or object files compiled with this library.
-    You may not restrict the the usage of this library.
-    You may distribute this library as part of another package or as a modified package
-    if and only if you do not restrict the usage of the portions consisting
-    of this (optionally modified) library.
-    If distributed as a modified package then this file must be included.
-
-    This library 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.
-
-MinGW profiling code
-    MinGW profiling code is distributed under the GNU General Public License. 
-
-The development tools such as GCC, GDB, GNU Make, etc all covered by GNU General Public License.
diff --git a/packaging_tools/windows/launch4j/w32api/libadvapi32.a b/packaging_tools/windows/launch4j/w32api/libadvapi32.a
deleted file mode 100644
index c471853..0000000
Binary files a/packaging_tools/windows/launch4j/w32api/libadvapi32.a and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/w32api/libgcc.a b/packaging_tools/windows/launch4j/w32api/libgcc.a
deleted file mode 100644
index d3f8947..0000000
Binary files a/packaging_tools/windows/launch4j/w32api/libgcc.a and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/w32api/libkernel32.a b/packaging_tools/windows/launch4j/w32api/libkernel32.a
deleted file mode 100644
index 5d3eb07..0000000
Binary files a/packaging_tools/windows/launch4j/w32api/libkernel32.a and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/w32api/libmingw32.a b/packaging_tools/windows/launch4j/w32api/libmingw32.a
deleted file mode 100644
index d1f7888..0000000
Binary files a/packaging_tools/windows/launch4j/w32api/libmingw32.a and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/w32api/libmsvcrt.a b/packaging_tools/windows/launch4j/w32api/libmsvcrt.a
deleted file mode 100644
index 6714146..0000000
Binary files a/packaging_tools/windows/launch4j/w32api/libmsvcrt.a and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/w32api/libshell32.a b/packaging_tools/windows/launch4j/w32api/libshell32.a
deleted file mode 100644
index d35fbda..0000000
Binary files a/packaging_tools/windows/launch4j/w32api/libshell32.a and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/w32api/libuser32.a b/packaging_tools/windows/launch4j/w32api/libuser32.a
deleted file mode 100644
index 387fb65..0000000
Binary files a/packaging_tools/windows/launch4j/w32api/libuser32.a and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/web/bullet.gif b/packaging_tools/windows/launch4j/web/bullet.gif
deleted file mode 100644
index f3f133b..0000000
Binary files a/packaging_tools/windows/launch4j/web/bullet.gif and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/web/changelog.html b/packaging_tools/windows/launch4j/web/changelog.html
deleted file mode 100644
index 098cf35..0000000
--- a/packaging_tools/windows/launch4j/web/changelog.html
+++ /dev/null
@@ -1,434 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<title>Launch4j - Cross-platform Java executable wrapper</title>
-		<meta name="description" content="Cross-platform Java executable wrapper for creating lightweight Windows native EXEs. Provides advanced JRE search, application startup configuration and better user experience.">
-		<meta name="keywords" content="java executable wrapper, java application wrapper, exe wrapper, jar wrapper, wrap, wraps, wrapping, free software, launch, launcher, linux, mac, windows, open source, ant, native splash screen, deploy, build tool">
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-		<meta name="author" content="Grzegorz Kowal" >
-		<link rel="stylesheet" type="text/css" href="style.css">
-	</head>
-	<body>
-		<div id="container">
-			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.8</span>
-			</div>
-			<div id="leftnav">
-				<ul>
-					<li><a href="index.html">Home</a></li>
-					<li><a href="docs.html">Docs</a></li>
-					<li><a href="changelog.html">Changelog</a></li>
-					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.8">Download</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
-					<li><a href="http://sourceforge.net/tracker/?atid=613100&group_id=95944">Bug tracker</a></li>
-					<li><a href="links.html">Links</a></li>
-				</ul>
-				<br />
-				<a class="button" href="https://sourceforge.net/projects/launch4j/files/launch4j-3/3.8" rel="nofollow"><img alt="Downloads" src="https://img.shields.io/sourceforge/dm/launch4j.svg"></a>
-				<a class="button" href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j" src="https://sourceforge.net/sflogo.php?type=10&group_id=95944"></a>
-			</div>
-			<div id="content">
-<h2>Changelog</h2>
-
-<h4>Changes in version 3.8 (09-05-2015)</h4>
-<ul class="changes">
-	<li>FR #59 Mavenized launch4j (thanks to taxone, Paul Jungwirth, Lukasz Lenart).</li>
-	<li>Ticket #139 Sign4j compiles and works on Linux (Tim Angus).</li>
-</ul>
-
-<h4>Changes in version 3.7 (01-03-2015)</h4>
-<ul class="changes">
-	<li>Fixed false positive virus warnings that appeared in version 3.6.</li>
-</ul>
-
-<h4>Changes in version 3.6 (06-01-2015)</h4>
-<ul class="changes">
-	<li>FR #86 The 32/64 bit search is fully configurable (64, 64/32, 32/64, 32) - added option 32/64.</li>
-	<li>FR #70 Java search sequence - bundled JRE can be used before or after the min/max version search (bundledJreAsFallback).</li>
-	<li>Fixed: Crash when classpath contained wildcard patterns where the dependency was in the same directory as the launcher.</li>
-	<li>Fixed launch4j GUI application closing - the process was still running.</li>
-	<li style="text-decoration: line-through">Updated to Dev-Cpp 5.7.1, MinGW 4.8.1 (head_src and w32api files).</li>
-</ul>
-
-<h4>Changes in version 3.5 (09-10-2014)</h4>
-<ul class="changes">
-	<li>Ticket #75 Fixed exit value of -1 results in launch4j error.</li>
-	<li>Ticket #133, #134 Fixed runtimeBits JRE option.</li>
-	<li>FR #28, #72 Ability to restart the application based on exit code (Pascal Gruen, GK).</li>
-</ul>
-
-<h4>Changes in version 3.4 (21-04-2014)</h4>
-<ul class="changes">
-	<li>FR #61 Added a new special variable JREHOMEDIR (Stefan Knoefel).</li>
-	<li>Ticket #130 Removed ant from launch4j classpath to fix problems with other ant versions.</li>
-	<li>Updated JGoodies libraries.</li>
-	<li>Added logging based on launch4j environment variable for file association launch testing.</li>
-</ul>
-
-<h4>Changes in version 3.3 (02-04-2014)</h4>
-<ul class="changes">
-	<li>FR #60 Check the registry during JRE search, so that only valid runtimes are taken into account.</li>
-	<li>Ticket #128 Updated MAC OS X 10.8 windres to 2.24.51.20140326 - version info was compiled incorrectly (Code Buddy).</li>
-	<li>Added support for Japanese characters (Toshimm).</li>
-	<li>Ticket #82, #125 Take configuration encoding into account and save file with UTF-8 encoding.</li>
-</ul>
-
-<h4>Changes in version 3.2 (24-03-2014)</h4>
-<ul class="changes">
-	<li>Ticket #126, #127: Fixed crash when classpath was not defined.</li>
-	<li>Corrected problem with loading jvm options from ini file when bundled JRE is used.</li>
-	<li>FR #63, #80 Add possibility to configure 32/64 bit search.</li>
-	<li>Improved logging (--l4j-debug and --l4j-debug-all).</li>
-</ul>
-
-<h4>Changes in version 3.1.0-beta2 (20-08-2013)</h4>
-<ul class="changes">
-	<li>Removed the custom process name feature which was not compatible with newer Windows versions.</li>
-	<li>#121 Fixed heap calculation on systems with more than 4GB of memory.</li>
-	<li>#115 Added 64-bit bundled JRE option to control when the 32-bit maximum heap is applied.</li>
-	<li>Reduced the 32-bit max heap size to the safer 1GB.</li>
-	<li>Changes in --l4j-debug for better readability.</li>
-	<li>Fixed Can discard changes popup which appeared even if no changes were made.</li>
-	<li>Corrected permissions, owner and group in tgz packages.</li>
-	<li>#117 Fixed launch4j home dir search in case of jar and class files.</li>
-	<li>#111 Support paths with spaces in Linux systems.</li>
-	<li>#91 Linux launch4j starting script no longer changes the current directory.</li>
-	<li>#77 Allow line feeds in custom messages.</li>
-	<li>#57 Escape backslashes.</li>
-</ul>
-
-<h4>Changes in version 3.1.0-beta1 (02-12-2012)</h4>
-<ul class="changes">
-	<li>Migrated code to Java 1.6.</li>
-	<li>Updated binutils to 2.22</li>
-	<li>Added Max OS X x86 support (two versions).</li>
-	<li>Added feature to digitally sign executables - sign4j by the Bramfeld team, sponsored by Servoy.</li>
-	<li>FR #3569093 Support Windows Security Features of the Windows 8 certification kit (Luc Bruninx).</li>
-</ul>
-
-<h4>Changes in version 3.0.2 (02-01-2011)</h4>
-<ul class="changes">
-	<li>Fixed the command line in Exec error message.</li>
-	<li>Fixed set environment variable bug.</li>
-	<li>Added wrapper logging to launch4j GUI.</li>
-	<li>Fixed critical bug: heap size over the limit.</li>
-</ul>
-
-<h4>Changes in version 3.0.1 (20-07-2008)</h4>
-<ul class="changes">
-	<li>Enhanced the runtime logging (--l4j-debug).</li>
-	<li>Fixed critical bug #1925387 64-bit JDK detection problem caused a runtime search error (found by Stivo).</li>
-	<li>Fixed bug #1919406, #1989479 Not every option is loaded from saved xml file (found by Robert Lachner, Jan-Philipp Rathje).</li>
-	<li>Fixed bug #1930222 Simple typo (found by Daniel).</li>
-</ul>
-
-<h4>Changes in version 3.0.0 (16-03-2008)</h4>
-<ul class="changes">
-	<li>FR #1390075 Added dynamic initial/max heap values.</li>
-	<li>FR #1707827 Allow to prefer JDK private runtimes over JREs (Ian Roberts).</li>
-	<li>FR #1730245 Allow to run only a single aplication instance (Sylvain Mina).</li>
-	<li>FR #1391610 Added IBM JRE/JDK support.</li>
-	<li>Added environment variable expansion in bundled JRE path.</li>
-	<li>Fixed critical bug #1882524 JRE detection problem on 64-bit Windows.</li>
-	<li>Fixed bug #1758912 Vista elevation to full administrator privileges.</li>
-	<li>Fixed bug #1784341 Problems with spaces in paths under linux (Michael Piefel).</li>
-	<li>Fixed bug where /bin was appended to path environment variable instead of jre_path/bin.</li>
-</ul>
-
-<h4>Changed license to BSD, MIT (26-01-2008)</h4>
-<ul class="changes">
-	<li>
-		The upcoming Launch4j 3.0.0 release will be licensed under the much more
-		liberal new BSD license. The head subproject (the binary header attached to wrapped jars)
-		will be licensed under the similar MIT license.
-	</li>
-</ul>
-
-<h4>Changes in version 3.0.0-pre2 (29-10-2006)</h4>
-<ul class="changes">
-	<li>Enhanced GUI.</li>
-	<li>Redesigned error reporting.</li>
-	<li>Added custom error messages.</li>
-	<li>Added support website feature.</li>
-	<li>Added PWD and OLDPWD special variables and access to the registry.</li>
-	<li>Runtime ini file extension changed to .l4j.ini, added comments (#).</li>
-	<li>FR #1427811 Initial process priority.</li>
-	<li>FR #1547339 Added VarFileInfo structure to Version Info (Stephan Laertz).</li>
-	<li>FR #1584295 Updated documentation for --l4j-debug.
-	<li>Fixed <jarArgs/> and <args/> config conversion bug (found by Dafe Simonek).</li>
-	<li>Fixed the Ant task exception reporting bug, added tmpdir and bindir attributes.</li>
-	<li>Fixed bug #1563415 Problem with launching application when ini file exists (found by mojomax).</li>
-	<li>Fixed bug #1527619 Console header wildcard expansion (found by erikjv).</li>
-	<li>Fixed bug #1544167 NPE when dontwrap and only classpath given (found by Hendrik Schreiber).</li>
-	<li>Fixed bug #1584264 Dropdown boxes get mixed up (found by Larsen).</li>
-</ul>
-
-<h4>News (17-10-2006)</h4>
-<ul class="changes">
-	<li><a href="http://9stmaryrd.com/tools/launch4j-maven-plugin/">Launch4j Maven Plugin by Paul A. Jungwirth</a></li>
-</ul>
-
-<h4>Changes in version 3.0.0-pre1 (21-07-2006)</h4>
-<ul class="changes">
-	<li>Improved configuration file format and embedded Ant config.</li>
-	<li>Launch executable jars, regular jars and class files.</li>
-	<li>Added dynamic classpath resolution with environment variable references and wildcards.</li>
-	<li>Added option to set environment variables before launching the application.</li>
-	<li>New command line switches to change the compiled options.</li>
-	<li>Improved debug information.</li>
-	<li>Added support for XP visual style manifests.</li>
-	<li>Added option to disable use of private JREs.</li>
-	<li>Many small fixes and improvements...</li>
-</ul>
-
-<h4 class="warn">Configuration file changes in 3.x</h4>
-<ul class="changes">
-	<li>Previous formats (1.x and 2.x) are supported.</li>
-	<li><em><headerType></em> accepts gui|console</li>
-	<li><em><jarArgs></em> was changed to <em><cmdLine></em></li>
-	<li>
-		<em><launch4jConfig><headerObjects><file></em> was changed to
-		<em><launch4jConfig><obj></em>
-	</li>
-	<li>
-		<em><launch4jConfig><libs><file></em> was changed to
-		<em><launch4jConfig><lib></em>
-	</li>
-	<li>
-		<em><launch4jConfig><jre><args></em> was changed to multiple
-		<em><launch4jConfig><jre><opt></em>
-	</li>
-</ul>
-
-<h4 class="warn">Embedded Ant configuration changes in 3.x</h4>
-<ul class="changes">
-	<li>
-		<em><jre args="value"></em> was changed to
-		<em><jre><opt>value</opt></jre></em>
-	</li>
-	<li>Now it's possible to define headerObjects, libs and classpath.</li>
-</ul>
-
-<h4>Changes in version 2.1.5 (21-07-2006)</h4>
-<ul class="changes">
-	<li>Changed the Java download site to http://java.com/download.</li>
-	<li>Now it's possible to use absolute and relative paths to specify the bundled JRE.</li>
-</ul>
-
-<h4>Changes in version 2.1.4 (15-06-2006)</h4>
-<ul class="changes">
-	<li>
-		Fixed bug #1503996 Only the first wrapper instance had a custom process name
-		(found by Helge Böhme).
-	</li>
-</ul>
-
-<h4>Changes in version 2.1.3 (31-05-2006)</h4>
-<ul class="changes">
-	<li>
-		Fixed bug #1497453 Ant task doesn't support relative jar path with '..'
-		(found by Aston, Pavel Moukhataev).
-	</li>
-	<li>Jar argument size limit is now 16KB.</li>
-	<li>Environment variable size limit raised to 32KB.</li>
-	<li>Allow to concatenate multiple env. variables in one property (Maria D.)</li>
-	<li>Added launch4j.tmpdir property.</li>
-</ul>
-
-<h4>Changes in version 2.1.2 (03-04-2006)</h4>
-<ul class="changes">
-	<li>Important bugfix: insufficient command line buffer size was increased to 32KB
-	(found by Sebastian Kopsan).</li>
-	<li>Added runtime JVM options from an .ini file.</li>
-	<li>Launch4j's bin directory is now configurable through launch4j.bindir
-	system property.</li>
-</ul>
-
-<h4>Changes in version 2.1.1 (25-01-2006)</h4>
-<ul class="changes">
-	<li>Fixed bug #1402748. Validation error occurred when using an Ant task with
-		embedded config and dontWrapJar option (found by Chris Nokleberg).</li>
-</ul>
-
-<h4>Changes in version 2.1.0 (10-01-2006)</h4>
-<ul class="changes">
-	<li><b>More features and smaller header: 18 KB!!</b></li>
-	<li>Added launcher mode, you can choose whether or not to wrap the jar.</li>
-	<li>Spanish translation of the website/docs and program messages
-		(Patricio Martínez Ros).</li>
-	<li>JRE's bin directory is appended to the Path environment variable
-		(Ianiv Schweber).</li>
-	<li>Added special variables EXEDIR and EXEFILE that hold the executable's
-		directory and full path.</li>
-	<li>Support for mapping environment variables to system properties.</li>
-	<li>Added debug launching mode - various information is displayed before
-		starting the Java application.</li>
-	<li>Fixed min/max JRE version checking, previous versions allowed these
-		to be equal (found by Ryan).</li>
-	<li>Bug fixed. Quotes in jar/JVM arguments were handled incorrectly (found by Juan Alvarez Ferrando).</li>
-	<li>A few other enhancements.</li>
-</ul>
-
-<h4>Changes in version 2.0.0 (31-10-2005)</h4>
-<ul class="changes">
-	<li>Launch4j for Mac OS X is available thanks to Peter Centgraf.</li>
-	<li>Added support for custom headers.</li>
-	<li>Fixed bug #1343908, command line arguments with spaces were handled
-		incorrectly by the console header (found by Oliver Schaefer / Steve Alberty).</li>
-	<li>Fixed stdin redirection bug (found by Timo Santasalo).</li>
-</ul>
-
-<h4>Changes in version 2.0 RC3 (13-08-2005) - final RC</h4>
-<ul class="changes">
-	<li>Correct handling of pathnames with spaces.</li>
-	<li>Fixed the '%20' pathname bug.</li>
-	<li>Fixed basedir bug (Richard Xing).</li>
-	<li>Splash screen can be closed when the application window becomes visible
-		with out specifying it's title (Martin Busik).
-		Update your config file: <em><waitForTitle>title</waitForTitle></em>
-		is now <em><waitForWindow>true</waitForWindow></em>.
-	</li>
-	<li>Fixed build.bat files in demo directories.</li>
-</ul>
-
-<h4>Changes in version 2.0 RC2 (21-06-2005)</h4>
-<ul class="changes">
-	<li>chdir allows to change the current directory to arbitrary paths
-		relative to the executable (FR #1144907). It's incompatible with
-		previous versions, update your config file:
-		<em><chdir>true</chdir></em>
-		is now <em><chdir>.</chdir></em>.
-	</li>
-	<li>Bundled JRE path no longer depends on chdir function.</li>
-	<li>Fixed Ant task bug, build files outside launch4j's directory
-		wouldn't work. Josh Elsasser submitted a patch that works without
-		setting launch4j's home dir in the build file. Thanks!
-	</li>
-	<li>Removed static edge from splash screen (Serge Baranov).</li>
-	<li>Program checks that the output file path doesn't contain spaces.</li>
-	<li>Fixed a NPE bug caused by a missing maxVersion property
-		(found by Morgan Schweers).
-	</li>
-	<li>Fixed relative JRE path bug (found by Nili_).</li>
-	<li>Cleaned up the Builder class.</li>
-	<li>Fixed Ant task NPE where the config was entirely defined in the
-		build file (Josh Elsasser).
-	</li>
-</ul>
-
-<h4>Changes in version 2.0 RC (07-06-2005)</h4>
-<ul class="changes">
-	<li>Added an Ant task for better build integration.</li>
-	<li>Added 2.x documentation.</li>
-	<li>Updated the demo configuration files.</li>
-	<li>Fixed issues with relative paths in the configuration.</li>
-	<li>Removed the '-1' option in console mode.</li>
-	<li>Minor fixes.</li>
-</ul>
-
-<h4>Changes in version 2.0 beta2 (23-05-2005)</h4>
-<ul class="changes">
-	<li># comments are recognized when importing 1.x cfg files.</li>
-	<li>Added version information.</li>
-	<li>Resource file is displayed when a resource error occurs.</li>
-	<li>Fixed a bug found by Max, options on the first tab were always enabled.</li>
-</ul>
-
-<h4>Changes in version 2.0 beta1 (13-05-2005)</h4>
-<ul class="changes">
-	<li>Completely new, cross-platform wrapper - create windows executables on Linux.</li>
-	<li>New .xml configuration file.</li>
-	<li>Application icon with multiple resolutions and color depths.</li>
-	<li>Swing GUI interface.</li>
-	<li>Header compiled with MinGW port of gcc instead of VC++.</li>
-</ul>
-
-<h4>Changes in version 1.4.2 (12-03-2005)</h4>
-<ul class="changes">
-	<li>Fixed bug #1158143, stayAlive without a splash screen caused
-		an infinite loop (found by Gregory Kotsaftis).
-	</li>
-</ul>
-
-<h4>Changes in version 1.4.1 (04-03-2005)</h4>
-<ul class="changes">
-	<li>Fixed bug #1119040, buffer for reading config properties
-		was too short (found by Tom Jensen and Neil).
-	</li>
-	<li>Added configurable splash timeout (FR #1102951).</li>
-	<li>Added option to disable the error message on splash timeout (FR #1109159).</li>
-	<li>Option to keep the gui launcher 'alive' after starting an application (FR #1124653).</li>
-	<li>Removed version info.</li>
-	<li>'waitfor' property is now optional.</li>
-</ul>
-
-<h4>Changes in version 1.4.0 (26-01-2005)</h4>
-<ul class="changes">
-	<li>Removed .lch4j suffix from process name, now it has the
-		form of the executable filename. The temporary launchers are stored in
-		launch4j-tmp directory (suggested by Emmanuel).
-	</li>
-	<li>Added support for console apps (FR #1050053).</li>
-</ul>
-
-<h4>Changes in version 1.3.1 (05-11-2004)</h4>
-<ul class="changes">
-	<li>Fixed a bug where explorer window was opened instead of
-		launching the application when setProcName was set to false
-		(found by Rob Jones).
-	</li>
-	<li>Fixed temporary launcher deletion bug.</li>
-</ul>
-
-<h4>Changes in version 1.3.0 (01-11-2004)</h4>
-<ul class="changes">
-	<li>Now you can configure launch4j to:
-		<ul class="changes">
-			<li>Use a bundled JRE.</li>
-			<li>Search for java, show an error message if the
-				right version cannot be found and open the java download page.</li>
-			<li>And a feature you asked for: use bundled JRE, if
-				that fails search for java and bring up the java download page on error.</li>
-		</ul>
-	</li>
-	<li>Enhanced code that sets the custom process name. In
-		case launch4j can't refresh the temporary launcher, bundled JRE on a
-		read only file system for example, it will use one created previously,
-		if it's present and has the correct size. If not, launching will still
-		continue, but with javaw.exe process name.Temporary launchers are
-		now created in the jre directory instead of jre/bin.
-	</li>
-	<li>errTitle property allows to set the title of the error message box.</li>
-</ul>
-
-<h4>Changes in version 1.2.1 (25-09-2004)</h4>
-<ul class="changes">
-	<li>Bugfix that allows launching from command line using short
-		name (#1026514 / found by Zach Del)
-	</li>
-</ul>
-
-<h4>Changes in version 1.2.0 (10-09-2004)</h4>
-<ul class="changes">
-	<li><strong>Custom process name</strong> (<i>myapp.lch4j.exe</i>)</li>
-	<li><strong>9 KB stub!</strong></li>
-	<li>Jar arguments</li>
-	<li>Bugfix that allows launching from command line.</li>
-	<li>Hide splash on javaw error.</li>
-	<li>Easier configuration with case insensitive parameters + show unrecognized parameter.</li>
-	<li>12 KB demo application, 34 KB with splash screen.</li>
-	<li>Configuration parameter <em>'args'</em> changed to <em>'jvmArgs'</em></li>
-</ul>
-			</div>
-			<div class="footer">
-			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright © 2005-2015 Grzegorz Kowal
-            	<p style="margin-top: 0.5em">
-            	    <a href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j Executable Wrapper" src="https://sourceforge.net/sflogo.php?type=16&group_id=95944"></a>
-            	</p>
-			</div>
-		</div>
-	</body>
-</html>
diff --git a/packaging_tools/windows/launch4j/web/docs.html b/packaging_tools/windows/launch4j/web/docs.html
deleted file mode 100644
index 64b4120..0000000
--- a/packaging_tools/windows/launch4j/web/docs.html
+++ /dev/null
@@ -1,668 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<title>Launch4j - Cross-platform Java executable wrapper</title>
-		<meta name="description" content="Cross-platform Java executable wrapper for creating lightweight Windows native EXEs. Provides advanced JRE search, application startup configuration and better user experience.">
-		<meta name="keywords" content="java executable wrapper, java application wrapper, exe wrapper, jar wrapper, wrap, wraps, wrapping, free software, launch, launcher, linux, mac, windows, open source, ant, native splash screen, deploy, build tool">
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-		<meta name="author" content="Grzegorz Kowal" >
-		<link rel="stylesheet" type="text/css" href="style.css">
-	</head>
-	<body>
-		<div id="container">
-			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.8</span>
-			</div>
-			<div id="leftnav">
-				<ul>
-					<li><a href="index.html">Home</a></li>
-					<li><a href="docs.html">Docs</a></li>
-					<li><a href="changelog.html">Changelog</a></li>
-					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.8">Download</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
-					<li><a href="http://sourceforge.net/tracker/?atid=613100&group_id=95944">Bug tracker</a></li>
-					<li><a href="links.html">Links</a></li>
-				</ul>
-				<br />
-				<a class="button" href="https://sourceforge.net/projects/launch4j/files/launch4j-3/3.8" rel="nofollow"><img alt="Downloads" src="https://img.shields.io/sourceforge/dm/launch4j.svg"></a>
-				<a class="button" href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j" src="https://sourceforge.net/sflogo.php?type=10&group_id=95944"></a>
-			</div>
-			<div id="content">
-<a href="#Running_launch4j">Running launch4j</a><br>
-<a href="#Configuration_file">Configuration file</a><br>
-<a href="#Importing_1.x_configuration">Importing 1.x configuration</a><br>
-<a href="#Ant_task">Ant Task</a><br>
-<a href="#Additional_jvm_options">Additional JVM options at runtime</a><br>
-<a href="#Runtime_options">Runtime options</a><br>
-<a href="#Settings">Settings</a><br>
-
-<h2 id="Running_launch4j">Running launch4j</h2>
-Run <em>launch4j.exe</em> or <em>launch4j</em> script without command
-line arguments to enter the GUI mode.
-
-<pre>launch4j.exe</pre>
-
-To wrap a jar in console mode use <em>launch4jc.exe</em> <em></em>and
-specify the configuration file.
-
-<pre>launch4jc.exe config.xml</pre>
-
-On Linux use the <em>launch4j</em> script.
-
-<pre>launch4j ./demo/l4j/config.xml</pre>
-
-<h2 id="Configuration_file">Configuration file</h2>
-Launch4j requires an xml configuration file for each output executable.
-You can create and edit it conveniently using the graphic user
-interface or your favorite editor. Alternatively it's possible to pass
-all of the configuration parameters through the Ant task. All files
-may be absolute paths or relative to the configuration file path.
-
-<pre>
-<!--
-  <strong>Bold</strong> elements are required.
-  <span class="codeword"><u>Underlined</u></span> values are the default when the element is not specified.
-  %VAR% expands environment/special variables and registry keys.
--->
-<strong><launch4jConfig></strong>
-  <strong><headerType></strong><span class="codeword">gui|console</span><strong></headerType></strong>
-  <strong><outfile></strong><span class="codeword">file.exe</span><strong><span class="codeword"></span></outfile></strong>
-  <jar><span class="codeword">file</span><span class="codeword"></span></jar>
-  <dontWrapJar><span class="codeword">true|<u>false</u></span></dontWrapJar>
-  <errTitle><span class="codeword">application name</span></errTitle>
-  <downloadUrl><span class="codeword"><u>http://java.com/download</u></span></downloadUrl>
-  <supportUrl><span class="codeword">url</span></supportUrl>
-  <cmdLine><span class="codeword">text</span></cmdLine>
-  <chdir><span class="codeword">path</span></chdir>
-  <priority><span class="codeword"><u>normal</u>|idle|high</span></priority>
-  <stayAlive><span class="codeword">true|false</span></stayAlive>
-  <restartOnCrash><span class="codeword">true|false</span></restartOnCrash>
-  <icon><span class="codeword">file</span></icon>
-  <obj><span class="codeword">header object file</span></obj>
-  ...
-  <lib><span class="codeword">w32api lib</span></lib>
-  ...
-  <var><span class="codeword">var=text (%VAR%)</span></var>
-  ...
-  <classPath>
-    <strong><mainClass></strong><span class="codeword">main class</span><strong></mainClass></strong>
-    <strong><cp></strong><span class="codeword">classpath (%VAR%)</span><strong></cp></strong>
-    ...
-  </classPath>
-  <singleInstance>
-    <strong><mutexName></strong><span class="codeword">text</span><strong></mutexName></strong>
-    <windowTitle><span class="codeword">text</span></windowTitle>
-  </singleInstance> 
-  <strong><jre></strong>
-    <!-- Specify <strong>path</strong> or <strong>minVersion</strong> or both. -->
-    <strong><path></strong><span class="codeword">bundled JRE path (%VAR%)</span><strong></path></strong>
-    <bundledJre64Bit><span class="codeword">true|<u>false</u></span></bundledJre64Bit>
-    <bundledJreAsFallback><span class="codeword">true|<u>false</u></span></bundledJreAsFallback>
-    <strong><minVersion></strong><span class="codeword">x.x.x[_xx]</span><strong></minVersion></strong>
-    <maxVersion><span class="codeword">x.x.x[_xx]</span></maxVersion>
-    <jdkPreference><span class="codeword">jreOnly|<u>preferJre</u>|preferJdk|jdkOnly</span></jdkPreference>
-    <runtimeBits><span class="codeword">64|<u>64/32</u>|32/64|32</span></runtimeBits>
-    <!-- Heap sizes in MB and % of available memory. -->
-    <initialHeapSize><span class="codeword">MB</span></initialHeapSize>
-    <initialHeapPercent><span class="codeword">%</span></initialHeapPercent>
-    <maxHeapSize><span class="codeword">MB</span></maxHeapSize>
-    <maxHeapPercent><span class="codeword">%</span></maxHeapPercent>
-    <opt><span class="codeword">text (%VAR%)</span></opt>
-    ...
-  <strong></jre></strong>
-  <splash>
-    <strong><file></strong><span class="codeword">file</span><strong></file></strong>
-    <waitForWindow><span class="codeword"><u>true</u>|false</span></waitForWindow>
-    <timeout><span class="codeword">seconds [60]</span></timeout>
-    <timeoutErr><span class="codeword"><u>true</u>|false</span></timeoutErr>
-  </splash>
-  <versionInfo>
-    <strong><fileVersion></strong><span class="codeword">x.x.x.x</span><strong></fileVersion></strong>
-    <strong><txtFileVersion></strong><span class="codeword">text</span><strong></txtFileVersion></strong>
-    <strong><fileDescription></strong><span class="codeword">text</span><strong></fileDescription></strong>
-    <strong><copyright></strong><span class="codeword">text</span><strong></copyright></strong>
-    <strong><productVersion></strong><span class="codeword">x.x.x.x</span><strong></productVersion></strong>
-    <strong><txtProductVersion></strong><span class="codeword">text</span><strong></txtProductVersion></strong>
-    <strong><productName></strong><span class="codeword">text</span><strong></productName></strong>
-    <companyName><span class="codeword">text</span></companyName>
-    <strong><internalName></strong><span class="codeword">filename</span><strong></internalName></strong>
-    <strong><originalFilename></strong><span class="codeword">filename.exe</span><strong></originalFilename></strong>
-  </versionInfo>
-  <messages>
-    <strong><startupErr></strong>text<strong></startupErr></strong>
-    <strong><bundledJreErr></strong>text<strong></bundledJreErr></strong>
-    <strong><jreVersionErr></strong>text<strong></jreVersionErr></strong>
-    <strong><launcherErr></strong>text<strong></launcherErr></strong>
-    <!-- Used by console header only. -->
-    <strong><instanceAlreadyExistsMsg></strong>text<strong></instanceAlreadyExistsMsg></strong>
-  </messages>
-<strong></launch4jConfig></strong>
-</pre>
-
-<dl>
-	<dt><headerType></dt>
-	<dd>
-		Type of the header used to wrap the application.
-		<table>
-			<thead>
-		    	<tr>
-		    		<th>Header type</th>
-		    		<th>Launcher</th>
-		    		<th>Splash screen</th>
-		    		<th style="white-space: nowrap">Wait for the application to close</th>
-		    	</tr>
-			</thead>
-			<tbody>
-		    	<tr>
-		    		<td>gui</td>
-		    		<td>javaw</td>
-		    		<td>yes</td>
-		    		<td class="description">wrapper waits only if <em>stayAlive</em> is set to true,
-		    			otherwise it terminates immediately or after closing
-		    			the splash screen.
-		    		</td>
-		    	</tr>
-		    	<tr>
-		    		<td>console</td>
-		    		<td>java</td>
-		    		<td>no</td>
-		    		<td class="description">always waits and returns application's exit code.</td>
-		    	</tr>
-		    </tbody>
-		</table>
-	</dd>
-</dl>
-<dl>
-	<dt><outfile></dt>
-	<dd>Output executable file.</dd>
-</dl>
-<dl>
-	<dt><jar></dt>
-	<dd>
-		Optional, by default specifies the jar to wrap. To launch a jar without
-		wrapping it enter the runtime path of the jar relative to
-		the executable and set <em><dontWrapJar></em> to true.
-		For example, if the executable launcher and the application jar named
-		<i>calc.exe</i> and <i>calc.jar</i> are in the same directory
-		then you would use <i><jar>calc.jar</jar></i>
-		and <em><dontWrapJar>true</dontWrapJar></em>.
-	</dd>
-</dl>
-<dl>
-	<dt><dontWrapJar></dt>
-	<dd>
-		Optional, defaults to false. Launch4j by default wraps jars in native
-		executables, you can prevent this by setting <em><dontWrapJar></em> to true.
-		The exe acts then as a launcher and starts the application specified in
-		<em><jar></em> or <em><classPath><mainClass></em>
-	</dd>
-</dl>
-<dl>
-	<dt><errTitle></dt>
-	<dd>
-		Optional, sets the title of the error message box that's displayed if Java cannot
-		be found for instance. This usually should contain the name of your
-		application. The console header prefixes error messages with this
-		property (myapp: error...)
-	</dd>
-</dl>
-<dl>
-	<dt><cmdLine></dt>
-	<dd>Optional, constant command line arguments.</dd>
-</dl>
-<dl>
-	<dt><chdir></dt>
-	<dd>Optional. Change current directory to an arbitrary path relative to the executable.
-		If you omit this property or leave it blank it will have no effect.
-		Setting it to <em>.</em> will change the current dir to the same directory
-		as the executable. <em>..</em> will change it to the parent directory, and so on.
-	</dd>
-	<dd>
-		<pre><chdir>.</chdir></pre>
-	</dd>
-	<dd>
-		<pre><chdir>../somedir</chdir></pre>
-	</dd>
-</dl>
-<dl>
-	<dt><stayAlive></dt>
-	<dd>Optional, defaults to false in GUI header, always true in console header.
-		When enabled the launcher waits for the Java application
-		to finish and returns it's exit code.
-	</dd>
-</dl>
-<dl>
-	<dt><restartOnCrash></dt>
-	<dd>Optional, defaults to false.
-		When the application exits, any exit code other than 0 is considered a crash and the application will be started again.
-	</dd>
-</dl>
-<dl>
-	<dt><icon></dt>
-	<dd>Application icon in ICO format. May contain multiple color depths/resolutions.</dd>
-</dl>
-<dl>
-	<dt><obj></dt>
-	<dd>Optional, custom headers only. Ordered list of header object files.</dd>
-</dl>
-<dl>
-	<dt><lib></dt>
-	<dd>Optional, custom headers only. Ordered list of libraries used by header.</dd>
-</dl>
-<dl>
-	<dt><singleInstance></dt>
-	<dd>Optional, allow to run only a single instance of the application.</dd>
-</dl>
-<blockquote>
-	<dl>
-		<dt><mutexName></dt>
-		<dd>Unique mutex name that will identify the application.</dd>
-		<dt><windowTitle></dt>
-		<dd>Optional, recognized by GUI header only. Title or title part of a window
-			to bring up instead of running a new instance.
-		</dd>
-	</dl>
-</blockquote>
-<dl>
-	<dt><jre></dt>
-	<dd>Required element that groups JRE settings.</dd>
-</dl>
-<blockquote>
-    <dl>
-    	<dt><path>, <minVersion>, <maxVersion></dt>
-        <dd>The <em><path></em> property is used
-    		to specify the absolute or relative path (to the executable) of a bundled JRE, it
-    		does not rely on the current directory or <em><chdir></em>.
-    		Note that this path is not checked until the actual application execution.
-    		If you'd like the wrapper to search for a JRE (public or SDK private)
-    		use the <em><minVersion></em> property, you may also specify
-    		the <em><maxVersion></em> to prevent it from using higher Java versions.
-    		Launch4j will always use the highest version available (in the min/max range of course).
-    		If a Sun's JRE is not available or does not satisfy the search criteria,
-    		the search will be repeated on IBM runtimes.
-    		You can also combine these properties to change the startup process...
-    	</dd>
-	</dl>
-	<blockquote>
-        <dl>
-        	<dt><path></dt>
-        	<dd>Run if bundled JRE and javaw.exe are present, otherwise stop with error.</dd>
-            <dt><path> + <minVersion>  [+ <maxVersion>]</dt>
-            <dd>Use bundled JRE first, if it cannot be located search for Java,
-        		if that fails display error message and open the Java download page.
-        	</dd>
-            <dt><minVersion>  [+ <maxVersion>]</dt>
-            <dd>Search for Java, if an appropriate version cannot be found display
-        		error message and open the Java download page.
-        	</dd>
-        </dl>
-	</blockquote>
-</blockquote>
-<blockquote>
-	<dl>
-		<dt><bundledJre64Bit></dt>
-		<dd>Optional, defaults to false which limits the calculated heap size to the 32-bit maximum.
-			Set to true in order to use the available memory without this limit. This option works 
-			in combination with the HeapSize and HeapPercent options only if the found JRE is a bundled one.
-			In the standard JRE search based on registry the wrapper detects the type of JRE itself
-			and uses the 32-bit heap limit when needed. 
-		</dd>
-	</dl>
-</blockquote>
-<blockquote>
-	<dl>
-		<dt><bundledJreAsFallback></dt>
-		<dd>Optional, defaults to false which treats the bundled JRE as the primary runtime.
-			When set to true, the bundled JRE will only be used in case the mix/max version search fails.
-			This can be used as a fallback option if the user does not have the required Java installed
-			and the bundled JRE	is provided on a CD or shared network location.
-		</dd>
-	</dl>
-</blockquote>
-<blockquote>
-	<dl>
-		<dt><jdkPreference></dt>
-		<dd>Optional, defaults to preferJre; Allows you to specify a preference
-			for a public JRE or a private JDK runtime. Valid values are:
-		</dd>
-	</dl>
-	<blockquote>
-		<dl>
-			<dt>jreOnly</dt>
-			<dd>Always use a public JRE (equivalent to the
-				old option dontUsePrivateJres=true)</dd>
-			<dt>preferJre</dt>
-			<dd>Prefer a public JRE, but use a JDK private
-				runtime if it is newer than the public
-				JRE (equivalent to the old option
-				dontUsePrivateJres=false)</dd>
-			<dt>preferJdk</dt>
-			<dd>Prefer a JDK private runtime, but use a
-				public JRE if it is newer than the JDK
-			</dd>
-			<dt>jdkOnly</dt>
-			<dd>Always use a private JDK runtime (fails
-				if there is no JDK installed)
-			</dd>
-		</dl>
-	</blockquote>
-	<dl>
-		<dt><runtimeBits></dt>
-		<dd>Optional, defaults to 64/32; Allows to select between 64-bit and 32-bit runtimes.
-			Valid values are:
-		</dd>
-	</dl>
-	<blockquote>
-		<dl>
-			<dt>64</dt>
-			<dd>Use only 64-bit runtimes</dd>
-			<dt>64/32</dt>
-			<dd>Use 64-bit runtimes if available, otherwise use 32-bit</dd>
-			<dt>32/64</dt>
-			<dd>Use 32-bit runtimes if available, otherwise use 64-bit</dd>
-			<dt>32</dt>
-			<dd>Use only 32-bit runtimes</dd>
-		</dl>
-	</blockquote>
-	<dl>
-		<dt>HeapSize, HeapPercent</dt>
-		<dd>If size and percent are specified, then the setting which yields
-			more memory will be chosen at runtime. In other words, setting both values
-			means: percent of available memory no less than size in MB.
-		</dd>
-	</dl>
-	<blockquote>
-		<dl>
-			<dt><initialHeapSize></dt>
-			<dd>Optional, initial heap size in MB.</dd>
-		</dl>
-		<dl>
-			<dt><initialHeapPercent></dt>
-			<dd>Optional, initial heap size in % of available memory.</dd>
-		</dl>
-		<dl>
-			<dt><maxHeapSize></dt>
-			<dd>Optional, max heap size in MB.</dd>
-		</dl>
-		<dl>
-			<dt><maxHeapPercent></dt>
-			<dd>Optional, max heap size in % of available memory.</dd>
-		</dl>	
-	</blockquote>
-	<dl>
-		<dt><opt></dt>
-		<dd>Optional, accepts everything you would normally pass to
-			java/javaw launcher: assertion options, system properties and X options.
-			Here you can map environment and special variables <em>EXEDIR</em>
-			(exe's runtime directory), <em>EXEFILE</em> (exe's runtime full file path)
-			to system properties. All variable references must be surrounded with
-			percentage signs and quoted.
-<pre>
-<opt>-Dlaunch4j.exedir="%EXEDIR%"</opt>
-<opt>-Dlaunch4j.exefile="%EXEFILE%"</opt>
-<opt>-Denv.path="%Path%"</opt>
-<opt>-Dsettings="%HomeDrive%%HomePath%\\settings.ini"</opt>
-</pre>
-		</dd>
-	</dl>
-</blockquote>
-
-<dl>
-	<dt><splash></dt>
-	<dd>Optional, groups the splash screen settings. Allowed only in GUI header.</dd>
-</dl>
-<blockquote>
-	<dl>
-		<dt><file></dt>
-		<dd>Splash screen image in BMP format.</dd>
-	</dl>
-	<dl>
-		<dt><waitForWindow></dt>
-		<dd>Optional, defaults to true. Close the splash screen when an application
-			window or Java error message box appears. If set to false,
-			the splash screen will be closed on timeout.
-		</dd>
-	</dl>
-	<dl>
-		<dt><timeout></dt>
-		<dd>Optional, defaults to 60. Number of seconds after which the splash screen
-			must be closed. Splash timeout may cause an error depending on
-			<em><timeoutErr></em>.
-		</dd>
-	</dl>
-	<dl>
-		<dt><timeoutErr></dt>
-		<dd>Optional, defaults to true. True signals an error on splash timeout,
-			false closes the splash screen quietly.
-		</dd>
-	</dl>
-</blockquote>
-
-<dl>
-	<dt><versionInfo></dt>
-	<dd>Optional, version information to be displayed by the Windows Explorer.</dd>
-</dl>
-<blockquote>
-	<dl>
-		<dt><fileVersion></dt>
-		<dd>Version number 'x.x.x.x'</dd>
-	</dl>
-	<dl>
-		<dt><txtFileVersion></dt>
-		<dd>Free form file version, for example '1.20.RC1'.</dd>
-	</dl>
-	<dl>
-		<dt><fileDescription></dt>
-		<dd>File description presented to the user.</dd>
-	</dl>
-	<dl>
-		<dt><copyright></dt>
-		<dd>Legal copyright.</dd>
-	</dl>
-	<dl>
-		<dt><productVersion></dt>
-		<dd>Version number 'x.x.x.x'</dd>
-	</dl>
-	<dl>
-		<dt><txtProductVersion></dt>
-		<dd>Free form file version, for example '1.20.RC1'.</dd>
-	</dl>
-	<dl>
-		<dt><productName></dt>
-		<dd>Text.</dd>
-	</dl>
-	<dl>
-		<dt><companyName></dt>
-		<dd>Optional text.</dd>
-	</dl>
-	<dl>
-		<dt><internalName></dt>
-		<dd>Internal name without extension, original filename or module name for example.</dd>
-	</dl>
-	<dl>
-		<dt><originalFilename></dt>
-		<dd>Original name of the file without the path. Allows to determine
-			whether a file has been renamed by a user.
-		</dd>
-	</dl>
-</blockquote>
-
-<h2 id="Importing_1.x_configuration">Importing 1.x configuration</h2>
-It's possible to import a 1.x configuration file using the GUI
-interface. Open the file, correct the paths and save it as a new xml
-configuration.
-
-<h2 id="Ant_task">Ant task</h2>
-You may set a launch4j directory property or change the task definition.
-
-<pre><property name="launch4j.dir" location="/opt/launch4j" /></pre>
-
-Define the task in your Ant build script.
-
-<pre>
-<taskdef name="launch4j"
-    classname="net.sf.launch4j.ant.Launch4jTask"
-    classpath="${launch4j.dir}/launch4j.jar
-        :${launch4j.dir}/lib/xstream.jar" />
-</pre>
-
-Execute the task!
-
-<pre><launch4j configFile="./l4j/demo.xml" /></pre>
-
-You can set or override the following configuration properties...
-<p class="attrib">
-	jar="absolute path or relative to <em>basedir</em>"<br>
-	jarPath="relative path"<br>	
-	outfile<br>
-	fileVersion<br>
-	txtFileVersion<br>
-	productVersion<br>
-	txtProductVersion<br>
-	bindir="<a href="#Settings">alternate bin directory...</a>"<br>
-	tmpdir="<a href="#Settings">alternate working directory...</a>"
-</p>
-
-<pre>
-<launch4j configFile="./l4j/demo.xml" outfile="mydemo.exe"
-    fileVersion="1.0.0.0" txtFileVersion="1.0 RC2" />
-</pre>
-
-You can also define the entire configuration in the task, but it will
-not be possible to edit such a file in the GUI mode. All paths except
-for <em><chdir></em>, <em><jre><path></em> and <em>jarPath</em>
-are calculated using the <em>basedir</em> project attribute.
-
-<pre>
-<launch4j>
-  <config headerType="gui" outfile="demo.exe"
-      dontWrapJar="true" jarPath="demo.jar" >
-    <var>SETTINGS="%HomeDrive%%HomePath%\\settings.ini"</var>
-    <classPath mainClass="org.demo.DemoApp">
-        <cp>./lib/looks.jar</cp>
-        <cp>%USER_LIBS%/*.jar</cp>
-    </classPath>
-    <jre minVersion="1.4.0">
-        <opt>-Dlaunch4j.exedir="%EXEDIR%"</opt>
-        <opt>-Dlaunch4j.exefile="%EXEFILE%"</opt>
-    </jre>
-  </config>
-</launch4j>
-</pre>
-
-<h2 id="Additional_jvm_options">Additional JVM options at runtime</h2>
-When you create a wrapper or launcher all configuration details are compiled into the
-executable and cannot be changed without recreating it or hacking with a resource editor.
-Launch4j 2.1.2 introduces a new feature that allows to pass additional JVM options
-at runtime from an .l4j.ini file. Now you can specify the options in the configuration file,
-ini file or in both, but you cannot override them. The ini file's name must correspond
-to the executable's <em>(myapp.exe : myapp.l4j.ini)</em>.
-The arguments should be separated with spaces or new lines, environment variable
-expansion is supported, for example:
-<pre>
-# Launch4j runtime config
--Dswing.aatext=true
--Dsomevar="%SOMEVAR%"
--Xms16m
-</pre>
-
-<h2>Environemnt variables</h2>
-The following variables can be used in the configuration file (elements which contain %VAR%).
-They are substitued during runtime, so for example the EXEDIR is the directory where the user installed the wrapped application.
-<dl>
-	<dt class="option">%VAR%</dt>
-	<dd>
-		Any environment variable, for example %HOMEPATH%.
-	</dd>
-
-	<dt class="option">%EXEDIR%</dt>
-	<dd>
-		Wrapper directory path.
-	</dd>
-	
-	<dt class="option">%EXEFILE%</dt>
-	<dd>
-		Wrapper executable file path.
-	</dd>
-	
-	<dt class="option">%PWD%</dt>
-	<dd>
-		Current directory, after chdir was applied.
-	</dd>
-	
-	<dt class="option">%OLDPWD%</dt>
-	<dd>
-		Directory before chdir was applied.
-	</dd>
-	
-	<dt class="option">%JREHOMEDIR%</dt>
-	<dd>
-		Path to the JRE which was selected for executing the application. 
-	</dd>
-	
-	<dt class="option">%HKEY_...\...%</dt>
-	<dd>
-		Registry key value, e.g.<br />
-		%HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MemoryDiagnostic\LastScanTime%
-	</dd>
-</dl>
-
-<h2 id="Runtime_options">Runtime options</h2>
-<dl>
-	<dt class="option">--l4j-debug</dt>
-	<dd>
-		To make sure the output executable is configured correctly you can use the
-		debug launching mode to log various information to the launch4j.log file.
-		Environment variable can also be used...<br />
-		SET Launch4j=debug
-	</dd>
-
-	<dt class="option">--l4j-debug-all</dt>
-	<dd>
-		Same as above, but additionally log loaded resources (options stored during wrapper creation).
-		Environment variable can also be used...<br />
-		SET Launch4j=debug-all
-	</dd>	
-	
-	<dt class="option">--l4j-dont-wait</dt>
-	<dd>
-		Disable the "stay alive" function.
-	</dd>
-
-	<dt class="option">--l4j-no-splash</dt>
-	<dd>
-		Disable the splash screen.
-	</dd>
-
-	<dt class="option">--l4j-no-splash-err</dt>
-	<dd>
-		Disable splash screen error on timeout, might be useful on very slow computers.
-	</dd>
-</dl>
-
-<h2 id="Settings">Settings</h2>
-These settings are only used during building of the launcher or wrapper, not during their execution.
-<dl>
-	<dt>Alternate bin directory: launch4j.bindir</dt>
-	<dd>
-		It's possible to override the default bin directory location which contains windres and ld
-		tools using the <em>launch4j.bindir</em> system property. The property can have two forms:
-		a path relative to Launch4j's directory (<em>altbin</em> for example) or an absolute path.
-	<dd>
-
-  <dt>Working directory: launch4j.tmpdir</dt>
-  <dd>Change the working directory if the default path contains spaces which windres cannot handle.</dd>
-</dl>
-			</div>
-			<div class="footer">
-			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright © 2005-2015 Grzegorz Kowal
-            	<p style="margin-top: 0.5em">
-            	    <a href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j Executable Wrapper" src="https://sourceforge.net/sflogo.php?type=16&group_id=95944"></a>
-            	</p>
-			</div>
-		</div>
-	</body>
-</html>
diff --git a/packaging_tools/windows/launch4j/web/index.html b/packaging_tools/windows/launch4j/web/index.html
deleted file mode 100644
index e527b39..0000000
--- a/packaging_tools/windows/launch4j/web/index.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<title>Launch4j - Cross-platform Java executable wrapper</title>
-		<meta name="description" content="Cross-platform Java executable wrapper for creating lightweight Windows native EXEs. Provides advanced JRE search, application startup configuration and better user experience.">
-		<meta name="keywords" content="java executable wrapper, java application wrapper, exe wrapper, jar wrapper, wrap, wraps, wrapping, free software, launch, launcher, linux, mac, windows, open source, ant, native splash screen, deploy, build tool">
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-		<meta name="author" content="Grzegorz Kowal" >
-		<link rel="stylesheet" type="text/css" href="style.css">
-	</head>
-	<body>
-		<div id="container">
-			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.8</span>
-			</div>
-			<div id="leftnav">
-				<ul>
-					<li><a href="index.html">Home</a></li>
-					<li><a href="docs.html">Docs</a></li>
-					<li><a href="changelog.html">Changelog</a></li>
-					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.8">Download</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
-					<li><a href="http://sourceforge.net/tracker/?atid=613100&group_id=95944">Bug tracker</a></li>
-					<li><a href="links.html">Links</a></li>
-				</ul>
-				<br />
-				<a class="button" href="https://sourceforge.net/projects/launch4j/files/launch4j-3/3.8" rel="nofollow"><img alt="Downloads" src="https://img.shields.io/sourceforge/dm/launch4j.svg"></a>
-				<a class="button" href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j" src="https://sourceforge.net/sflogo.php?type=10&group_id=95944"></a>
-			</div>
-			<div id="content">
-<h2>Cross-platform Java executable wrapper</h2>
-<p>
-    Launch4j is a cross-platform tool for wrapping
-    Java applications distributed as jars in lightweight Windows
-    native executables. The executable can be
-    configured to search for a certain JRE version or
-    use a bundled one, and it's possible to set
-    runtime options, like the initial/max heap size.
-    The wrapper also provides better user experience
-    through an application icon, a native pre-JRE
-    splash screen, and a Java download page in case
-    the appropriate JRE cannot be found.
-</p>
-<img style="width: 352px; height: 498px; margin-left: 100px;" src="launch4j-use.gif" alt="How to use Launch4">
-<h2>Features</h2>
-<ul>
-	<li>Launch4j wraps jars in Windows native executables and allows to run them
-		like a regular Windows program. It's possible to wrap applications
-		on Windows, Linux and Mac OS X!
-	</li>
-	<li>Also creates <strong>launchers</strong> for jars and class files without wrapping.</li>
-	<li>
-		Supports executable jars and <strong>dynamic classpath</strong> resolution using
-		environment variables and wildcards.
-	</li>
-	<li><strong>Doesn't extract the jar</strong> from the executable.</li>
-	<li>Custom application icon with multiple resolutions and color depths.</li>
-	<li><strong>Native pre-JRE splash screen</strong> in BMP format shown until
-		the Java application starts.
-	</li>
-	<li>Initial <strong>priority</strong> and <strong>single application instance</strong> features.
-	</li>
-	<li>Works with a bundled JRE or searches for newest Sun or IBM JRE / JDK in given
-		version range and type (64-bit or 32-bit).</li>
-	<li>Opens <strong>Java download page</strong> if an appropriate Java version cannot be
-		found or a <strong>support website</strong> in case of an error.
-	</li>
-	<li>Supports <strong>GUI and console apps</strong>.</li>
-	<li>Supports Windows <strong>application manifests</strong>.</li>
-	<li>Passes command line arguments, also supports constant arguments.</li>
-	<li>Allows to set the initial/max heap size also <strong>dynamically</strong> in percent of free memory.</li>
-	<li>JVM options: set system properties, tweak the garbage collection...</li>
-	<li>Runtime JVM options from an .l4j.ini file.</li>
-	<li>Runtime command line switches to change the compiled options.</li>
-	<li>Access to environment variables, the <strong>registry</strong> and executable file path through system properties.</li>
-	<li><strong>Set environment variables.</strong></li>
-	<li>Option to change current directory to the executable location.</li>
-	<li>The JRE's bin directory is appended to the Path environment variable.</li>
-	<li>Ability to restart the application based on exit code.</li>
-	<li>Custom <strong>version information</strong> shown by Windows Explorer.</li>
-	<li>Digital signing of the executable with sign4j.</li>
-	<li>Supports Windows Security Features of the Windows 8 certification kit.</li>
-	<li><strong>GUI</strong> and command line interface.</li>
-	<li>Build integration through an <strong>Ant task</strong> and a <strong><a href="https://github.com/lukaszlenart/launch4j-maven-plugin">Maven Plugin</a></strong>.</li>
-	<li><strong>Lightweight: 35 KB!</strong></li>
-	<li><strong>It's free</strong> and may be used for commercial purposes.</li>
-	<li>Includes a sample application and <strong>Ant script</strong>
-		that automates the build process from Java sources to native executable.
-	</li>
-	<li>The wrapped program works on all Windows platforms (98/Me/NT/2K/XP/Vista/7/8),
-		Launch4j works on NT/2K/XP/Vista/7/8, Linux and Mac OS X.
-	</li>
-</ul>
-<h2>License</h2>
-<p>
-	This program is free software licensed under the
-	<a href="http://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause License</a>, the <em>head</em> subproject
-	(the code which is attached to the wrapped jars) is licensed under the
-	<a href="http://opensource.org/licenses/mit-license.html">MIT License</a>.
-	Launch4j may be used for wrapping closed source, commercial applications.
-</p>
-<h2>Info</h2>
-<p>
-	Running Launch4j on other Java enabled platforms is a matter of getting a binary version
-	of <a href="http://www.mingw.org/">MinGW</a> binutils 2.22 (<em>windres</em> and <em>ld</em> only)
-	for your system or compiling them. If you'll provide these, I'll be able to create a binary package
-	available for download.
-</p>
-<a href="http://sourceforge.net/forum/forum.php?forum_id=332683"></a>
-			</div>
-			<div class="footer">
-			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright © 2005-2015 Grzegorz Kowal
-            	<p style="margin-top: 0.5em">
-            	    <a href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j Executable Wrapper" src="https://sourceforge.net/sflogo.php?type=16&group_id=95944"></a>
-            	</p>
-			</div>
-		</div>
-	</body>
-</html>
diff --git a/packaging_tools/windows/launch4j/web/launch4j-use.gif b/packaging_tools/windows/launch4j/web/launch4j-use.gif
deleted file mode 100644
index ccb8882..0000000
Binary files a/packaging_tools/windows/launch4j/web/launch4j-use.gif and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/web/launch4j.gif b/packaging_tools/windows/launch4j/web/launch4j.gif
deleted file mode 100644
index 2755207..0000000
Binary files a/packaging_tools/windows/launch4j/web/launch4j.gif and /dev/null differ
diff --git a/packaging_tools/windows/launch4j/web/links.html b/packaging_tools/windows/launch4j/web/links.html
deleted file mode 100644
index b9d4208..0000000
--- a/packaging_tools/windows/launch4j/web/links.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<title>Launch4j - Cross-platform Java executable wrapper</title>
-		<meta name="description" content="Cross-platform Java executable wrapper for creating lightweight Windows native EXEs. Provides advanced JRE search, application startup configuration and better user experience.">
-		<meta name="keywords" content="java executable wrapper, java application wrapper, exe wrapper, jar wrapper, wrap, wraps, wrapping, free software, launch, launcher, linux, mac, windows, open source, ant, native splash screen, deploy, build tool">
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-		<meta name="author" content="Grzegorz Kowal" >
-		<link rel="stylesheet" type="text/css" href="style.css">
-	</head>
-	<body>
-		<div id="container">
-			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.8</span>
-			</div>
-			<div id="leftnav">
-				<ul>
-					<li><a href="index.html">Home</a></li>
-					<li><a href="docs.html">Docs</a></li>
-					<li><a href="changelog.html">Changelog</a></li>
-					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.8">Download</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
-					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
-					<li><a href="http://sourceforge.net/tracker/?atid=613100&group_id=95944">Bug tracker</a></li>
-					<li><a href="links.html">Links</a></li>
-				</ul>
-				<br />
-				<a class="button" href="https://sourceforge.net/projects/launch4j/files/launch4j-3/3.8" rel="nofollow"><img alt="Downloads" src="https://img.shields.io/sourceforge/dm/launch4j.svg"></a>
-				<a class="button" href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j" src="https://sourceforge.net/sflogo.php?type=10&group_id=95944"></a>
-			</div>
-			<div id="content">
-<h2>Links</h2>
-<p>
-	<a href="https://github.com/lukaszlenart/launch4j-maven-plugin">Maven plugin by Lukasz Lenart<a><br>
-	<a href="http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.sf.launch4j%22%20AND%20a%3A%22launch4j%22">Maven Central Repository</a><br>
-    <a href="http://prdownloads.sourceforge.net/dev-cpp/devcpp-4.9.9.2_setup.exe">Bloodshed Dev-C++</a><br>
-	<a href="http://www.mingw.org/">MinGW</a><br>
-	<a href="http://jakarta.apache.org/commons/beanutils/">Commons BeanUtils</a><br>
-	<a href="http://jakarta.apache.org/commons/logging/">Commons Logging</a><br>
-	<a href="http://xstream.codehaus.org/">XStream</a><br>
-	<a href="http://www.jgoodies.com/freeware/libraries/">JGoodies</a><br>
-	<a href="http://www.eclipse.org/">Eclipse</a><br>
-</p>
-<h3>Windows native installers</h3>
-<p>
-	<a href="http://nsis.sourceforge.net/">NSIS</a> (cross-platform, targets Windows)<br>
-	<a href="http://www.jrsoftware.org/isinfo.php">Inno Setup</a><br>
-</p>
-			</div>
-			<div class="footer">
-			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright © 2005-2015 Grzegorz Kowal
-            	<p style="margin-top: 0.5em">
-            	    <a href="https://sourceforge.net/p/launch4j/" rel="nofollow"><img alt="Download Launch4j Executable Wrapper" src="https://sourceforge.net/sflogo.php?type=16&group_id=95944"></a>
-            	</p>
-			</div>
-		</div>
-	</body>
-</html>
diff --git a/packaging_tools/windows/launch4j/web/style.css b/packaging_tools/windows/launch4j/web/style.css
deleted file mode 100644
index c09ccff..0000000
--- a/packaging_tools/windows/launch4j/web/style.css
+++ /dev/null
@@ -1,166 +0,0 @@
-body, table {
-	font: 12px/20px Verdana, Arial, Helvetica, sans-serif;
-}
-
-
-pre {
-	padding: 8px;
-	border: 1px dashed #999999;
-	background-color: #f1f1f1;
-	font: 13px/20px "Courier New", Courier, monospace;
-}
-
-
-.version {
-	color: #307fe1;
-	font-weight: bold;
-}
-
-
-.codeword {
-	color: #3333ff;
-}
-.attrib {
-	color: #404040;
-}
-.option {
-	font-family: "Courier New", Courier, monospace;
-	font-weight: bold;
-}
-
-
-dt {
-	margin-top: 1.5em;
-	color: #404040;
-	font-size: 115%;
-	border-bottom: 1px solid #cccccc;
-}
-dd {
-	margin-left: 1em;
-}
-
-
-.warn, ul.changes em {
-	color: #ff0000;
-}
-
-
-table {
-	margin-top: 1em;
-	padding: 0;
-	border: 1px solid #999999;
-	border-collapse: collapse;
-	text-align: center;
-}
-table th {
-	padding: 2px 4px;
-	border: 1px solid #999999;
-	background-color: #f1f1f1;
-}
-table td {
-	padding: 2px 4px;
-	border: 1px solid #999999;
-}
-.description {
-	text-align: left;
-}
-
-
-#container {
-	width: 90%;
-	margin: 10px auto;
-	border-width: 0;
-	background-color: #ffffff;
-}
-
-
-#top {
-	padding: 0.5em;
-	background-color: #ffffff;
-}
-#top h1 {
-	margin: 0;
-	padding: 0;
-}
-
-
-#leftnav {
-	float: left;
-	width: 170px;
-	margin: 0;
-	padding: 0.5em;
-	background-color: #ffffff;
-}
-#leftnav ul {
-	margin: 0;
-	padding: 0;
-	border: none;
-	list-style-type: none;
-	font-size: 115%;
-}
-#leftnav a {
-	width: 170px;
-	height: 1.6em;
-	line-height: 1.6em;
-	display: block;
-	padding-left: 0.2em;
-}
-#leftnav a:link, #leftnav a:visited {
-	text-decoration: none;
-	color: #666666;
-}
-#leftnav a:hover {
-	background-color: #307fe1;
-	color: #ffffff;
-}
-
-#leftnav a.button {
-	display: inline;
-}
-#leftnav a.button:hover {
-	background-color: transparent;
-}
-
-
-#content {
-	max-width: 52em;
-	margin-left: 190px;
-	padding: 1em;
-	border-left: 1px solid #cccccc;
-	background-color: #ffffff;
-}
-
-#content ul {
-	list-style-image: url('bullet.gif');
-}
-
-#content a:link {
-	text-decoration: none;
-	color: #307fe1;
-}
-#content a:visited {
-	text-decoration: none;
-	color: #307fe1;
-}
-#content a:hover {
-	color: #307fe1;
-	text-decoration: underline;
-}
-
-#content h2 {
-	font-size: 150%;
-}
-#content h2:first-child {
-	margin: 0 0 0.5em;
-}
-
-
-.footer {
-	clear: both;
-	margin: 0;
-	padding: 0.5em;
-	background-color: #ffffff;
-	color: #333333;
-	text-align: center;
-	font-size: 90%;
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/beast-mcmc.git



More information about the debian-med-commit mailing list