diff --git a/.gitignore b/.gitignore
index 2e3a0fec..9f668884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 /config.properties
 /bin
 /setup_new.nsi
-/.metadata
\ No newline at end of file
+/.metadata
+/Deploy
diff --git a/BUILD.md b/BUILD.md
index 06f3559d..2b8d1361 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,42 +2,24 @@
 
 ## Requirements
 
-Download [Java SE Runtime Environment](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) 
-for Linux x86 and Linux x64 platform in ".tar.gz" format.
-
-```
-cd ./jre
-wget http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jre-8u101-linux-i586.tar.gz
-tar xf jre-8u101-linux-i586.tar.gz
-mv jre1.8.0_101 linjre32
-wget http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jre-8u101-linux-x64.tar.gz
-tar xf jre-8u101-linux-x64.tar.gz
-mv jre1.8.0_101 linjre64
-tar cf linjre.tar linjre32 linjre64
-cd ..
-```
-
-Install p7zip:
-
-```ShellSession
-apt-get install p7zip
-```
-
-Add bin folder:
+Java JDK installed as well as ant.
+It should work with the openjdk and ant packages from ubuntu.
 
 ```ShellSession
-mkdir ./bin
+sudo apt install openjdk-11-jdk
+sudo apt install ant
 ```
 
 ## Build
 
 ```ShellSession
+ant -buildfile ant/build-jar.xml
 ant -buildfile ant/deploy-release.xml
-ant -buildfile ant/setup-linux.xml binaries
+ant -buildfile ant/setup-release.xml
 ```
 
 Now you can run newly released FlashTool from `Deploy/FlashTool`:
 
 ```ShellSession
-./../Deploy/FlashTool/FlashTool
+./Deploy/FlashTool/FlashTool
 ```
diff --git a/ant/build-jar.xml b/ant/build-jar.xml
new file mode 100644
index 00000000..add5e5e5
--- /dev/null
+++ b/ant/build-jar.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    <project basedir="../" default="build" name="Flashtool">
+    <property environment="env"/>
+    <property name="debuglevel" value="source,lines,vars"/>
+    <property name="target" value="11"/>
+    <property name="source" value="11"/>
+    <path id="Flashtool.classpath">
+        <pathelement location="bin"/>
+        <pathelement location="libs/javax.annotation_1.2.0.jar"/>
+        <pathelement location="libs/javax.inject_1.0.0.jar"/>
+        <pathelement location="libs/ini4j-0.5.4.jar"/>
+        <pathelement location="libs/commons-io-2.6.jar"/>
+        <pathelement location="libs/jsr305-3.0.2.jar"/>
+        <pathelement location="libs/xstream-1.4.11.1.jar"/>
+        <pathelement location="libs/jsch-0.1.55.jar"/>
+        <pathelement location="libs/proxy-vole-1.0.6-SNAPSHOT.jar"/>
+        <pathelement location="libs/icu4j-64.2.jar"/>
+        <pathelement location="libs/jarchivelib-1.0.0.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.osgi_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.sftp_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/bsh-3.0.0-SNAPSHOT.jar"/>
+        <pathelement location="libs/slf4j-api-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/slf4j-ext-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/jna-5.5.0.jar"/>
+        <pathelement location="libs/jna-platform-5.5.0.jar"/>
+        <pathelement location="libs/jdom2-2.0.6.jar"/>
+        <pathelement location="libs/guava-28.2-jre.jar"/>
+        <pathelement location="libs/lz4-java-1.7.1.jar"/>
+        <pathelement location="libs/apk-parser-2.6.10.jar"/>
+        <pathelement location="libs/bcpg-jdk15on-1.64.jar"/>
+        <pathelement location="libs/bcpkix-jdk15on-1.64.jar"/>
+        <pathelement location="libs/bcprov-jdk15on-1.64.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.jobs_3.10.700.v20200106-1020.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.commands_3.9.700.v20191217-1850.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.app_1.4.400.v20191212-0743.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.preferences_3.7.700.v20191213-1901.jar"/>
+        <pathelement location="libs/jbbp-2.0.1.jar"/>
+        <pathelement location="libs/commons-compress-1.20.jar"/>
+        <pathelement location="libs/javax.activation-1.2.1-20181010.205421-2_modular.jar"/>
+        <pathelement location="libs/jaxb-api-2.4.0-b180830.0359.jar"/>
+        <pathelement location="libs/delight-nashorn-sandbox-0.1.28.jar"/>
+        <pathelement location="libs/js-beautify-1.9.0.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.contenttype_3.7.600.v20200124-1609.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.runtime_3.17.100.v20200203-0917.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.common_3.11.0.v20200206-0817.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.registry_3.8.700.v20200121-1457.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jface_3.19.0.v20200218-1607.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jface.text_3.16.200.v20200218-0828.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.osgi_3.15.200.v20200214-1600.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.text_3.10.100.v20200217-1239.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.ui.forms_3.9.0.v20200213-1442.jar"/>
+        <pathelement location="libs/log4j-api-2.13.1.jar"/>
+        <pathelement location="libs/log4j-core-2.13.1.jar"/>
+        <pathelement location="libs/log4j-slf4j18-impl-2.13.1.jar"/>
+        <pathelement location="libs/win/x86_64/org.eclipse.swt.win32.win32.x86_64_3.114.0.v20200304-0601.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit_5.7.0.202003110725-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit.archive_5.7.0.202003110725-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit.http.apache_5.7.0.202003110725-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit.ssh.apache_5.7.0.202003110725-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.swt_3.114.0.v20200304-0601.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.ui.workbench_3.118.0.v20200222-0719.jar"/>
+    </path>
+    <path id="run.Main.classpath">
+        <path refid="Flashtool.classpath"/>
+        <pathelement location="libs/javax.annotation_1.2.0.jar"/>
+        <pathelement location="libs/javax.inject_1.0.0.jar"/>
+        <pathelement location="libs/ini4j-0.5.4.jar"/>
+        <pathelement location="libs/commons-io-2.6.jar"/>
+        <pathelement location="libs/jsr305-3.0.2.jar"/>
+        <pathelement location="libs/xstream-1.4.11.1.jar"/>
+        <pathelement location="libs/jsch-0.1.55.jar"/>
+        <pathelement location="libs/proxy-vole-1.0.6-SNAPSHOT.jar"/>
+        <pathelement location="libs/icu4j-64.2.jar"/>
+        <pathelement location="libs/jarchivelib-1.0.0.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.osgi_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.sftp_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/bsh-3.0.0-SNAPSHOT.jar"/>
+        <pathelement location="libs/slf4j-api-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/slf4j-ext-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/jna-5.5.0.jar"/>
+        <pathelement location="libs/jna-platform-5.5.0.jar"/>
+        <pathelement location="libs/jdom2-2.0.6.jar"/>
+    </path>
+    <target name="init">
+        <mkdir dir="bin"/>
+        <copy includeemptydirs="false" todir="bin">
+            <fileset dir="src">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="bin"/>
+    </target>
+    <target depends="clean" name="cleanall"/>
+    <target depends="build-subprojects,build-project" name="build"/>
+    <target name="build-subprojects"/>
+    <target depends="init" name="build-project">
+        <echo message="${ant.project.name}: ${ant.file}"/>
+        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
+            <src path="src"/>
+            <classpath refid="Flashtool.classpath"/>
+        </javac>
+    </target>
+    <target name="Main">
+        <java classname="gui.Main" failonerror="true" fork="yes">
+            <classpath refid="run.Main.classpath"/>
+        </java>
+    </target>
+</project>
diff --git a/ant/deploy-beta.xml b/ant/deploy-beta.xml
index f5d71841..6a657e95 100644
--- a/ant/deploy-beta.xml
+++ b/ant/deploy-beta.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="all" name="Deploy Flashtool Beta">
-	
+
 	<property name="version" value="0.9.18.1"/>
 	<property name="progtime" value="08-25-2014 23:00:00"/>
-	
+
 	<target name="all" depends="core release"/>
 
 
 	<target name="clean">
-    	<mkdir dir="../../Deploy"/>
-    	<delete dir="../../Deploy/FlashTool"/>
+    	<mkdir dir="../Deploy"/>
+    	<delete dir="../Deploy/FlashTool"/>
 	</target>
 
 	<target name="clone">
-		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../../Deploy/FlashTool/devices" />
-	</target>	
-	
+		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../Deploy/FlashTool/devices" />
+	</target>
+
 	<target name="ressources">
-        <jar destfile="../../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
+        <jar destfile="../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
             <manifest>
                 <attribute name="Implementation-Version" value="${version}"/>
             	<attribute name="Implementation-Date" value="${progtime}"/>
@@ -30,58 +30,58 @@
     </target>
 
 	<target name="core release" depends="clean,ressources">
-        <mkdir dir ="../../Deploy/FlashTool"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/root"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir ="../../Deploy/FlashTool/custom/features"/>
-		<mkdir dir ="../../Deploy/FlashTool/custom/sin"/>
-		<mkdir dir ="../../Deploy/FlashTool/custom/mydevices"/>
-		<mkdir dir ="../../Deploy/FlashTool/firmwares"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_lib"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-        <mkdir dir="../../Deploy/FlashTool/drivers"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <mkdir dir ="../Deploy/FlashTool"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/root"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir ="../Deploy/FlashTool/custom/features"/>
+		<mkdir dir ="../Deploy/FlashTool/custom/sin"/>
+		<mkdir dir ="../Deploy/FlashTool/custom/mydevices"/>
+		<mkdir dir ="../Deploy/FlashTool/firmwares"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_lib"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+        <mkdir dir="../Deploy/FlashTool/drivers"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
     		<fileset dir="../shells"
 				excludes="**/.svn"/>
     	</copy>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+    	<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
     		<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
     	</copy>
-        <copy todir="../../Deploy/FlashTool/firmwares">
+        <copy todir="../Deploy/FlashTool/firmwares">
             <fileset dir="../firmwares"
                 excludes="**/.svn"/>
         </copy>
-	    <copy todir="../../Deploy/FlashTool/custom/root">
+	    <copy todir="../Deploy/FlashTool/custom/root">
 	       <fileset dir="../romupdates" excludes="**/.svn"/>
 	    </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs" excludes="**/.svn"/>
 	    </copy>
-		<chmod file="../../Deploy/FlashTool/x10flasher_lib/fastboot.mac" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_lib/adb.mac" perm="755" />
-        <chmod file="../../Deploy/FlashTool/x10flasher_lib/unyaffs.mac" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_lib/fastboot.mac" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_lib/adb.mac" perm="755" />
+        <chmod file="../Deploy/FlashTool/x10flasher_lib/unyaffs.mac" perm="755" />
     </target>
 
 	<target name="Shells only">
-        <delete dir="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir="../../Deploy/FlashTool/custom/shells"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <delete dir="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir="../Deploy/FlashTool/custom/shells"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
 			  <fileset dir="../shells"
 			           excludes="**/.svn"/>
 		</copy>
     </target>
 
 	<target name="Langs only">
-        <delete dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-    	<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+        <delete dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+    	<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
 			<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
 		</copy>
     </target>
-	
+
 	<taskdef resource="org/eclipse/jgit/ant/ant-tasks.properties">
 	       <classpath>
 	         <pathelement location="../libs/jgit.jar"/>
diff --git a/ant/deploy-release.xml b/ant/deploy-release.xml
index 0ddc1298..7458ec9c 100644
--- a/ant/deploy-release.xml
+++ b/ant/deploy-release.xml
@@ -4,16 +4,16 @@
 	<condition property="isMac">
 	   <os family="mac" />
 	</condition>
-	 
+
 	<condition property="isLinux">
-	   <and>   
+	   <and>
 	      <os family="unix" />
 	         <not>
-	            <os family="mac" />    
+	            <os family="mac" />
 	         </not>
 	   </and>
 	</condition>
-	 
+
 	<condition property="isWindows">
 	    <os family="windows" />
 	</condition>
@@ -22,18 +22,18 @@
 	<property name="progtime" value="18-11-2019 21:30:00"/>
 
 	<target name="all" depends="core release"/>
-	
+
 	<target name="clean">
-    	<mkdir dir="../../Deploy"/>
-    	<delete dir="../../Deploy/FlashTool"/>
+    	<mkdir dir="../Deploy"/>
+    	<delete dir="../Deploy/FlashTool"/>
 	</target>
 
 	<target name="clone">
-		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../../Deploy/FlashTool/devices" />
-	</target>	
+		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../Deploy/FlashTool/devices" />
+	</target>
 
 	<target name="ressources">
-        <jar destfile="../../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
+        <jar destfile="../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
             <manifest>
                 <attribute name="Implementation-Version" value="${version}"/>
             	<attribute name="Implementation-Date" value="${progtime}"/>
@@ -46,36 +46,36 @@
     </target>
 
 	<target name="core release" depends="clean, main_lib, ressources, Windowsbinaries, Linuxbinaries, Macbinaries">
-        <mkdir dir ="../../Deploy/FlashTool"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/root"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir ="../../Deploy/FlashTool/custom/features"/>
-		<mkdir dir ="../../Deploy/FlashTool/custom/sin"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_lib"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_native"/>
-		<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <mkdir dir ="../Deploy/FlashTool"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/root"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir ="../Deploy/FlashTool/custom/features"/>
+		<mkdir dir ="../Deploy/FlashTool/custom/sin"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_lib"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_native"/>
+		<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
     		<fileset dir="../shells"
 				excludes="**/.svn"/>
     	</copy>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+    	<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
     		<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
     	</copy>
-	    <copy todir="../../Deploy/FlashTool/custom/root">
+	    <copy todir="../Deploy/FlashTool/custom/root">
 	       <fileset dir="../romupdates" excludes="**/.svn"/>
 	    </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib/">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib/">
 	    	<fileset dir="../libs/eclipse/" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
     </target>
 
 	<target name="main_lib">
-        <jar destfile="../../Deploy/FlashTool/x10flasher.jar">
+        <jar destfile="../Deploy/FlashTool/x10flasher.jar">
             <manifest>
                 <attribute name="Main-Class" value="gui.Main"/>
                 <attribute name="Implementation-Version" value="${version}"/>
@@ -89,24 +89,24 @@
 	</target>
 
 	<target name="Macbinaries" if="isMac">
-	    <copy file="../launchers/FlashTool" todir="../../Deploy/FlashTool"/>
-	    <copy file="../launchers/FlashToolConsole" todir="../../Deploy/FlashTool"/>
-		<copy file="../launchers/xperifirm" todir="../../Deploy/FlashTool/x10flasher_lib"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_native">
+	    <copy file="../launchers/FlashTool" todir="../Deploy/FlashTool"/>
+	    <copy file="../launchers/FlashToolConsole" todir="../Deploy/FlashTool"/>
+		<copy file="../launchers/xperifirm" todir="../Deploy/FlashTool/x10flasher_lib"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_native">
             <fileset dir="../native/mac"
                 excludes="**/.svn"/>
         </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs/macos/x86_64/" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
-		<chmod file="../../Deploy/FlashTool/FlashTool" perm="755" />
-    	<chmod file="../../Deploy/FlashTool/FlashToolConsole" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.0.dylib" perm="755" />
-		<exec executable="ln" dir="../../Deploy/FlashTool/x10flasher_native/udev">
+		<chmod file="../Deploy/FlashTool/FlashTool" perm="755" />
+    	<chmod file="../Deploy/FlashTool/FlashToolConsole" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.0.dylib" perm="755" />
+		<exec executable="ln" dir="../Deploy/FlashTool/x10flasher_native/udev">
 		    <arg value="-sf"/>
 			<arg value="libusbx-1.0.0.dylib"/>
 			<arg value="libusbx-1.0.dylib"/>
@@ -114,26 +114,26 @@
 	</target>
 
 	<target name="Linuxbinaries" if="isLinux">
-	    <copy file="../launchers/FlashTool" todir="../../Deploy/FlashTool"/>
-	    <copy file="../launchers/FlashToolConsole" todir="../../Deploy/FlashTool"/>
-		<copy file="../launchers/xperifirm" todir="../../Deploy/FlashTool/x10flasher_native"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_native">
+	    <copy file="../launchers/FlashTool" todir="../Deploy/FlashTool"/>
+	    <copy file="../launchers/FlashToolConsole" todir="../Deploy/FlashTool"/>
+		<copy file="../launchers/xperifirm" todir="../Deploy/FlashTool/x10flasher_native"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_native">
             <fileset dir="../native/linux"
                 excludes="**/.svn"/>
         </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs/linux/x86_64/" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
-		<chmod file="../../Deploy/FlashTool/FlashTool" perm="755" />
-    	<chmod file="../../Deploy/FlashTool/FlashToolConsole" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/bin2elf" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/bin2sin" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.so.0.1.0" perm="755" />
-		<exec executable="ln" dir="../../Deploy/FlashTool/x10flasher_native/udev">
+		<chmod file="../Deploy/FlashTool/FlashTool" perm="755" />
+    	<chmod file="../Deploy/FlashTool/FlashToolConsole" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/bin2elf" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/bin2sin" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.so.0.1.0" perm="755" />
+		<exec executable="ln" dir="../Deploy/FlashTool/x10flasher_native/udev">
 		    <arg value="-sf"/>
 			<arg value="libusbx-1.0.so.0.1.0"/>
 			<arg value="libusbx-1.0.so"/>
@@ -141,28 +141,28 @@
 	</target>
 
 	<target name="Windowsbinaries" if="isWindows" depends="main_lib">
-		<copy file="../launchers/FlashTool64.exe" todir="../../Deploy/FlashTool"/>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy file="../launchers/FlashTool64.exe" todir="../Deploy/FlashTool"/>
+    	<copy todir="../Deploy/FlashTool/x10flasher_lib">
     		<fileset dir="../libs/win/x86_64/"/>
     	</copy>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_native">
+    	<copy todir="../Deploy/FlashTool/x10flasher_native">
     		<fileset dir="../native/win32/"/>
     	</copy>
 	</target>
 
 	<target name="Shells only">
-        <delete dir="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir="../../Deploy/FlashTool/custom/shells"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <delete dir="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir="../Deploy/FlashTool/custom/shells"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
 			  <fileset dir="../shells"
 			           excludes="**/.svn"/>
 		</copy>
     </target>
 
 	<target name="Langs only">
-        <delete dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-    	<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+        <delete dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+    	<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
 			<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
 		</copy>
diff --git a/ant/setup-release.xml b/ant/setup-release.xml
index 265345df..ac9d90da 100644
--- a/ant/setup-release.xml
+++ b/ant/setup-release.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <project default="all" name="Create Package">
-	  
+
 	<condition property="isMac">
 	   <os family="mac" />
 	</condition>
-	 
+
 	<condition property="isLinux">
-	   <and>   
+	   <and>
 	      <os family="unix" />
 	         <not>
-	            <os family="mac" />    
+	            <os family="mac" />
 	         </not>
 	   </and>
 	</condition>
-	 
+
 	<condition property="isWindows">
 	    <os family="windows" />
 	</condition>
-	
+
 	<target name="all" depends="Linuxsetup, Windowssetup, Macsetup"/>
 
     <target name="GenerateJRE">
-        <delete dir="../../Deploy/FlashTool/x10flasher_native/jre"/>
-        <echo>Running jlink to generate custom runtime</echo> 
-		<exec executable="${java.home}/bin/jlink" dir="../../Deploy/FlashTool/x10flasher_native">
+        <delete dir="../Deploy/FlashTool/x10flasher_native/jre"/>
+        <echo>Running jlink to generate custom runtime</echo>
+		<exec executable="${java.home}/bin/jlink" dir="../Deploy/FlashTool/x10flasher_native">
 		    <arg value="--output"/>
 		    <arg value="jre"/>
 		    <arg value="--no-header-files"/>
@@ -33,20 +33,20 @@
 		    <arg value="--strip-debug"/>
 		    <arg value="--add-modules"/>
 			<arg value="java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.jdi,jdk.unsupported,jdk.xml.dom,jdk.security.auth,jdk.security.jgss,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.management,jdk.scripting.nashorn"/>
-		</exec>        
-		<copy file="../jre/jce/local_policy.jar" todir="../../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>
-		<copy file="../jre/jce/US_export_policy.jar" todir="../../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>		
+		</exec>
+		<!--<copy file="../jre/jce/local_policy.jar" todir="../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>
+		<copy file="../jre/jce/US_export_policy.jar" todir="../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>-->
     </target>
-	
+
 	<target name="Windowsdrivers" if="isWindows">
-            <mkdir dir ="../../Deploy/FlashTool/drivers/"/>
+            <mkdir dir ="../Deploy/FlashTool/drivers/"/>
 	   	    <property environment="env"/>
 	        <nsis script="../drivers.nsi" path="${env.ProgramFiles}\NSIS"/>
 	</target>
 
 	<target name="Windowssetup" if="isWindows" depends="loadprops, Windowsdrivers, GenerateJRE">
 		<property environment="env"/>
-		<delete file="../../Deploy/FlashTool/config.properties"/>
+		<delete file="../Deploy/FlashTool/config.properties"/>
 		<delete file="../setup_new.nsi"/>
 		<copy file="../setup.nsi" tofile="../setup_new.nsi"/>
 		<replace file="../setup_new.nsi" token="FLASHTOOLVERSION" value="${Internal-Version}"/>
@@ -55,10 +55,10 @@
 	</target>
 
 	<target name="Linuxsetup" if="isLinux" depends="loadprops, GenerateJRE">
-	    <tar destfile="../../Deploy/flashtool-${Internal-Version}-linux.tar.xz" longfile="gnu" compression="xz">
-	       <tarfileset dir="../../Deploy/FlashTool" filemode="755" prefix="FlashTool">
+	    <tar destfile="../Deploy/flashtool-${Internal-Version}-linux.tar.gz" longfile="gnu" compression="gzip">
+				<tarfileset dir="../Deploy/FlashTool" filemode="755" prefix="FlashTool">
 				<include name="FlashTool"/>
-				<include name="FlashToolConsole"/>	
+				<include name="FlashToolConsole"/>
 				<include name="x10flasher_native/xperifirm"/>
 				<include name="x10flasher_native/adb"/>
 				<include name="x10flasher_native/bin2elf"/>
@@ -75,10 +75,10 @@
 				<include name="x10flasher_native/jre/bin/rmid"/>
 				<include name="x10flasher_native/jre/bin/jrunscript"/>
            </tarfileset>
-	       <tarfileset dir="../../Deploy/FlashTool" prefix="FlashTool">
+	       <tarfileset dir="../Deploy/FlashTool" prefix="FlashTool">
 	            <include name="**/*"/>
 				<exclude name="FlashTool"/>
-				<exclude name="FlashToolConsole"/>	
+				<exclude name="FlashToolConsole"/>
 				<exclude name="x10flasher_native/xperifirm"/>
 				<exclude name="x10flasher_native/adb"/>
 				<exclude name="x10flasher_native/bin2elf"/>
@@ -92,34 +92,34 @@
 				<exclude name="x10flasher_native/jre/bin/keytool"/>
 				<exclude name="x10flasher_native/jre/bin/java"/>
 				<exclude name="x10flasher_native/jre/bin/rmiregistry"/>
-				<exclude name="x10flasher_native/jre/bin/rmid"/>
+				<exclude name="x10flasisther_native/jre/bin/rmid"/>
 				<exclude name="x10flasher_native/jre/bin/jrunscript"/>
            </tarfileset>
 	    </tar>
 	</target>
-	
+
 	<target name="Macsetup" if="isMac" depends="loadprops, GenerateJRE">
-		<delete dir="../../Deploy/FlashTool.app"/>
-		<copy todir="../../Deploy/FlashTool.app">
+		<delete dir="../Deploy/FlashTool.app"/>
+		<copy todir="../Deploy/FlashTool.app">
             <fileset dir="../launchers/FlashTool.app"
                 excludes="**/.svn"/>
         </copy>
-		<mkdir dir="../../Deploy/FlashTool.app/Contents/MacOS"/>
+		<mkdir dir="../Deploy/FlashTool.app/Contents/MacOS"/>
         <echo message="Generating tar file flashtool-${Internal-Version}.tar"/>
-		<exec executable="tar" dir="../../Deploy/FlashTool">
+		<exec executable="tar" dir="../Deploy/FlashTool">
 		    <arg value="cf"/>
 			<arg value="../FlashTool.app/Contents/MacOS/flashtool-${Internal-Version}.tar"/>
 			<arg value="."/>
 		</exec>
         <echo message="Extracting tar file flashtool-${Internal-Version}.tar to prepare for dmg creation"/>
-		<exec executable="tar" dir="../../Deploy/FlashTool.app/Contents/MacOS">
+		<exec executable="tar" dir="../Deploy/FlashTool.app/Contents/MacOS">
 		    <arg value="xf"/>
 			<arg value="flashtool-${Internal-Version}.tar"/>
 		</exec>
-		<delete file="../../Deploy/FlashTool.app/Contents/MacOS/flashtool-${Internal-Version}.tar"/>
-		<delete file="../../Deploy/flashtool-${Internal-Version}-mac.dmg"/>
+		<delete file="../Deploy/FlashTool.app/Contents/MacOS/flashtool-${Internal-Version}.tar"/>
+		<delete file="../Deploy/flashtool-${Internal-Version}-mac.dmg"/>
         <echo message="Generating dmg file flashtool-${Internal-Version}-mac.dmg"/>
-		<exec executable="hdiutil" dir="../../Deploy">
+		<exec executable="hdiutil" dir="../Deploy">
 	       <arg value="create"/>
 		   <arg value="flashtool-${Internal-Version}-mac.dmg"/>
 		   <arg value="-srcFolder"/>
@@ -128,7 +128,7 @@
 	</target>
 
 	<target name="loadprops">
-		<loadmf jar="../../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar" prefix=""/>
+		<loadmf jar="../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar" prefix=""/>
 	</target>
 
 	<!--
@@ -150,7 +150,8 @@
 	         </loadproperties>
 	     </sequential>
 	</macrodef>
-    
-	<taskdef name="nsis" classname="com.danielreese.nsisant.Task"/>
 
-</project>
\ No newline at end of file
+	<taskdef name="nsis" classname="com.danielreese.nsisant.Task">
+		<classpath location="./nsisant-1.3.jar"/>
+	</taskdef>
+</project>
diff --git a/ant/xz-1.8.jar b/ant/xz-1.8.jar
deleted file mode 100644
index 9931efa3..00000000
Binary files a/ant/xz-1.8.jar and /dev/null differ
diff --git a/jre/.gitignore b/jre/.gitignore
deleted file mode 100644
index c446d358..00000000
--- a/jre/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/winjre.zip
-/linjre.tar
-/macjre.tar
diff --git a/jre/jce/US_export_policy.jar b/jre/jce/US_export_policy.jar
deleted file mode 100644
index 251b102c..00000000
Binary files a/jre/jce/US_export_policy.jar and /dev/null differ
diff --git a/jre/jce/local_policy.jar b/jre/jce/local_policy.jar
deleted file mode 100644
index 1c58939b..00000000
Binary files a/jre/jce/local_policy.jar and /dev/null differ