diff --git a/installer/create executable.xml b/installer/create executable.xml
deleted file mode 100644
index e005f07d..00000000
--- a/installer/create executable.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<launch4jConfig>
-  <dontWrapJar>false</dontWrapJar>
-  <headerType>0</headerType>
-  <jar>C:\Documents and Settings\Jared\Desktop\Enginuity-dist\Enginuity.jar</jar>
-  <outfile>C:\Documents and Settings\Jared\Desktop\enginuity-installer\Enginuity.exe</outfile>
-  <errTitle></errTitle>
-  <jarArgs></jarArgs>
-  <chdir>.</chdir>
-  <customProcName>false</customProcName>
-  <stayAlive>false</stayAlive>
-  <icon>C:\Documents and Settings\Jared\Desktop\Enginuity-dist\graphics\enginuity-ico.ico</icon>
-  <jre>
-    <path></path>
-    <minVersion>1.5.0</minVersion>
-    <maxVersion></maxVersion>
-    <initialHeapSize>0</initialHeapSize>
-    <maxHeapSize>0</maxHeapSize>
-    <args></args>
-  </jre>
-  <versionInfo>
-    <fileVersion>0.3.2.0</fileVersion>
-    <txtFileVersion>0.3.2 Beta</txtFileVersion>
-    <fileDescription>Enginuity 0.3.2 Beta</fileDescription>
-    <copyright>Enginuity.org</copyright>
-    <productVersion>0.3.2.0</productVersion>
-    <txtProductVersion>0.3.2 Beta</txtProductVersion>
-    <productName>Enginuity</productName>
-    <companyName>Enginuity.org</companyName>
-    <internalName>Enginuity.jar</internalName>
-    <originalFilename>Enginuity.exe</originalFilename>
-  </versionInfo>
-</launch4jConfig>
\ No newline at end of file
diff --git a/installer/create installer linux.bat b/installer/create installer linux.bat
new file mode 100644
index 00000000..3714d7b2
--- /dev/null
+++ b/installer/create installer linux.bat	
@@ -0,0 +1 @@
+..\IzPack\bin\compile install-linux.xml -b . -o Enginuity0.4.0b-linux.jar -k standard
\ No newline at end of file
diff --git a/installer/create installer win.bat b/installer/create installer win.bat
new file mode 100644
index 00000000..c3be357e
--- /dev/null
+++ b/installer/create installer win.bat	
@@ -0,0 +1 @@
+..\IzPack\bin\compile install-win.xml -b . -o Enginuity0.4.0b-win.jar -k standard
\ No newline at end of file
diff --git a/installer/create installer.bat b/installer/create installer.bat
deleted file mode 100644
index 96dbb3e5..00000000
--- a/installer/create installer.bat	
+++ /dev/null
@@ -1,3 +0,0 @@
-.
-"c:\Program Files\IzPack\bin\compile" install.xml -b . -o EnginuitySetup0.3.2b.jar -k standard
-pause
\ No newline at end of file
diff --git a/installer/install-linux.xml b/installer/install-linux.xml
new file mode 100644
index 00000000..49ec909b
--- /dev/null
+++ b/installer/install-linux.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+
+<installation version="1.0">
+
+    <info>
+        <appname>Enginuity</appname>
+        <appversion>0.4.0 Beta</appversion>
+        <authors>
+            <author name="Jared Gould" email="jared.gould@enginuity.org"/>
+        </authors>
+        <url>http://www.enginuity.org</url>
+    </info>  
+		<native type="izpack" name="ShellLink.dll"/>    
+    <guiprefs width="640" height="480" resizable="no"/>
+    <locale>
+        <langpack iso3="eng"/>
+    </locale>
+    <resources>
+        <res id="LicencePanel.licence" src="license.txt"/>
+        <res id="InfoPanel.info" src="release notes.txt"/>
+				<res id="shortcutSpec.xml" src="shortcutSpec.xml"/>
+    </resources>    
+    
+    <panels>
+        <!-- <panel classname="HelloPanel"/>
 -->
+        <panel classname="InfoPanel"/>
+        <panel classname="LicencePanel"/>
+        <panel classname="TargetPanel"/> 
+        <panel classname="PacksPanel"/>
+        <panel classname="ShortcutPanel"/>
+        <panel classname="InstallPanel"/>
+        <panel classname="SimpleFinishPanel"/>
+    </panels>    
+
+    <packs>
+        <pack name="Base" required="yes">
+            <description>Enginuity binary files</description>
+            <file src="Enginuity.jar"     targetdir="$INSTALL_PATH" />
+            <file src="license.txt"       targetdir="$INSTALL_PATH" />
+            <file src="release notes.txt" targetdir="$INSTALL_PATH" />
+            <file src="images"            targetdir="$INSTALL_PATH" />
+            <fileset dir="graphics" 	  	targetdir="$INSTALL_PATH/graphics" excludes="*.bmp" />
+            
+            <!-- Logger files -->
+            <file src="logger.xml"        targetdir="$INSTALL_PATH" />
+            <file src="logger.dtd"        targetdir="$INSTALL_PATH" />
+            <!-- Removed until 0.4.1b
+            <file src="profile.xml" targetdir="$INSTALL_PATH" />            
+            <file src="profile.dtd" targetdir="$INSTALL_PATH" />
+            -->
+
+        		<file src="lib/BareBonesBrowserLaunch.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/jep.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/JFontChooser.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/swing-layout-1.0.jar" targetdir="$INSTALL_PATH/lib" />
+        		
+        		<file src="lib/Graph3d/jama-1.0.2.jar" targetdir="$INSTALL_PATH/lib" />
+        				<file src="lib/Graph3d/linux/Graph3d.jar" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/Graph3d/linux/lib/j3dcore.jar" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/Graph3d/linux/lib/j3dutils.jar" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/Graph3d/linux/lib/libj3dcore-ogl.so" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/Graph3d/linux/lib/libj3dcore-ogl-cg.so" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/Graph3d/linux/lib/librxtxParallel.so" targetdir="$INSTALL_PATH/lib" os="unix" />        				
+        				<file src="lib/Graph3d/linux/lib/librxtxSerial.so" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/Graph3d/linux/lib/vecmath.jar" targetdir="$INSTALL_PATH/lib" os="unix" />  
+        		
+        		<file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib" />        				
+        				<file src="lib/jdic/linux/jdic_stub.jar" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/jdic/linux/x86/libjdic.so" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/jdic/linux/x86/libmozembed-linux-gtk1.2.so" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/jdic/linux/x86/libmozembed-linux-gtk2.so" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/jdic/linux/x86/libtray.so" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/jdic/linux/x86/mozembed-linux-gtk1.2" targetdir="$INSTALL_PATH/lib" os="unix" />
+        				<file src="lib/jdic/linux/x86/mozembed-linux-gtk2" targetdir="$INSTALL_PATH/lib" os="unix" />  
+        				
+        		<file src="lib/logger/jcommon-1.0.0.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/jfreechart-1.0.1.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/rxtx/INSTALL" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/rxtx/RXTXcomm.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/rxtx/rxtxSerial.dll" targetdir="$INSTALL_PATH/lib" />
+            	
+        </pack>
+        <!-- END Base Pack -->        
+        
+        <pack name="ECU Definitions" required="no">
+            <description>The latest official ECU definitions</description>
+            <file src="ecu_defs.xml" targetdir="$INSTALL_PATH"/>
+        </pack>        
+        
+        <pack name="Source Files" required="no">
+            <description>Enginuity Source Files</description>
+            <file src="src" targetdir="$INSTALL_PATH"/>
+        </pack>
+    </packs>    
+</installation>
diff --git a/installer/install-win.xml b/installer/install-win.xml
new file mode 100644
index 00000000..2a0f83b9
--- /dev/null
+++ b/installer/install-win.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+
+<installation version="1.0">
+
+    <info>
+        <appname>Enginuity</appname>
+        <appversion>0.4.0 Beta</appversion>
+        <authors>
+            <author name="Jared Gould" email="jared.gould@enginuity.org"/>
+        </authors>
+        <url>http://www.enginuity.org</url>
+    </info>  
+		<native type="izpack" name="ShellLink.dll"/>    
+    <guiprefs width="640" height="480" resizable="no"/>
+    <locale>
+        <langpack iso3="eng"/>
+    </locale>
+    <resources>
+        <res id="LicencePanel.licence" src="license.txt"/>
+        <res id="InfoPanel.info" src="release notes.txt"/>
+				<res id="shortcutSpec.xml" src="shortcutSpec.xml"/>
+    </resources>    
+    
+    <panels>
+        <!-- <panel classname="HelloPanel"/>
 -->
+        <panel classname="InfoPanel"/>
+        <panel classname="LicencePanel"/>
+        <panel classname="TargetPanel"/> 
+        <panel classname="PacksPanel"/>
+        <panel classname="ShortcutPanel"/>
+        <panel classname="InstallPanel"/>
+        <panel classname="SimpleFinishPanel"/>
+    </panels>    
+
+    <packs>
+        <pack name="Base" required="yes">
+            <description>Enginuity binary files</description>
+            <file src="Enginuity.exe"     targetdir="$INSTALL_PATH" os="windows" />
+            <file src="Enginuity.jar"     targetdir="$INSTALL_PATH" />
+            <file src="license.txt"       targetdir="$INSTALL_PATH" />
+            <file src="release notes.txt" targetdir="$INSTALL_PATH" />
+            <file src="images"            targetdir="$INSTALL_PATH" />
+            <fileset dir="graphics" 	  	targetdir="$INSTALL_PATH/graphics" excludes="*.bmp" />
+            
+            <!-- Logger files -->
+            <file src="logger.xml"        targetdir="$INSTALL_PATH" />
+            <file src="logger.dtd"        targetdir="$INSTALL_PATH" />
+            <!-- Removed until 0.4.1b
+            <file src="profile.xml" targetdir="$INSTALL_PATH" />            
+            <file src="profile.dtd" targetdir="$INSTALL_PATH" />
+            -->
+
+        		<file src="lib/BareBonesBrowserLaunch.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/jep.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/JFontChooser.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/swing-layout-1.0.jar" targetdir="$INSTALL_PATH/lib" />
+        		
+        		<file src="lib/Graph3d/jama-1.0.2.jar" targetdir="$INSTALL_PATH/lib" />
+        				<file src="lib/Graph3d/windows/Graph3d.jar" targetdir="$INSTALL_PATH/lib" os="windows" />
+        				<file src="lib/Graph3d/windows/lib/j3dcore.jar" targetdir="$INSTALL_PATH/lib" os="windows" />
+        				<file src="lib/Graph3d/windows/lib/j3dcore-ogl.dll" targetdir="$INSTALL_PATH/lib" os="windows" />
+        				<file src="lib/Graph3d/windows/lib/j3dcore-ogl-cg.dll" targetdir="$INSTALL_PATH/lib" os="windows" />
+        				<file src="lib/Graph3d/windows/lib/j3dutils.jar" targetdir="$INSTALL_PATH/lib" os="windows" />        				
+        				<file src="lib/Graph3d/windows/lib/vecmath.jar" targetdir="$INSTALL_PATH/lib" os="windows" />
+        		
+        		<file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib" />
+        				<file src="lib/jdic/windows/jdic_stub.jar" targetdir="$INSTALL_PATH/lib" os="windows" />
+        				<file src="lib/jdic/windows/x86/IeEmbed.exe" targetdir="$INSTALL_PATH/lib" os="windows" />
+        				<file src="lib/jdic/windows/x86/jdic.dll" targetdir="$INSTALL_PATH/lib" os="windows" />
+        				<file src="lib/jdic/windows/x86/MozEmbed.exe" targetdir="$INSTALL_PATH/lib" os="windows" />        				      				
+        				<file src="lib/jdic/windows/x86/tray.dll" targetdir="$INSTALL_PATH/lib" os="windows" />    			
+        				
+        		<file src="lib/logger/jcommon-1.0.0.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/jfreechart-1.0.1.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/rxtx/INSTALL" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/rxtx/RXTXcomm.jar" targetdir="$INSTALL_PATH/lib" />
+        		<file src="lib/logger/rxtx/rxtxSerial.dll" targetdir="$INSTALL_PATH/lib" />
+            	
+        </pack>
+        <!-- END Base Pack -->        
+        
+        <pack name="ECU Definitions" required="no">
+            <description>The latest official ECU definitions</description>
+            <file src="ecu_defs.xml" targetdir="$INSTALL_PATH"/>
+        </pack>        
+        
+        <pack name="Source Files" required="no">
+            <description>Enginuity Source Files</description>
+            <file src="src" targetdir="$INSTALL_PATH"/>
+        </pack>
+    </packs>    
+</installation>
diff --git a/installer/install.xml b/installer/install.xml
deleted file mode 100644
index 21c45197..00000000
--- a/installer/install.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-
-<installation version="1.0">
-
-    <!-- 
-        The info section.
-        The meaning of the tags should be natural ...
-    -->
-    <info>
-        <appname>Enginuity</appname>
-        <appversion>0.4.0 Beta</appversion>
-        <authors>
-            <author name="Jared Gould" email="jared.gould@enginuity.org"/>
-        </authors>
-        <url>http://www.enginuity.org</url>
-    </info>    
-    
-		<native type="izpack" name="ShellLink.dll"/>    
-    
-    <!-- 
-        The gui preferences indication.
-        Sets the installer window to 640x480. It will not be able to change the size.
-    -->
-    <guiprefs width="640" height="480" resizable="no"/>
-    
-    <!-- 
-        The locale section.
-        Asks here to include the English and French langpacks.
-    -->
-    <locale>
-        <langpack iso3="eng"/>
-    </locale>
-    
-    <!-- 
-        The resources section.
-        The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-    -->
-    <resources>
-        <res id="LicencePanel.licence" src="license.txt"/>
-        <res id="InfoPanel.info" src="release notes.txt"/>
-				<res id="shortcutSpec.xml" src="shortcutSpec.xml"/>
-    </resources>
-    
-    <!-- 
-        The panels section.
-        We indicate here which panels we want to use. The order will be respected.
-    -->
-    <panels>
-        <!-- <panel classname="HelloPanel"/>
 -->
-        <panel classname="InfoPanel"/>
-        <panel classname="LicencePanel"/>
-        <panel classname="TargetPanel"/> 
-        <panel classname="PacksPanel"/>
-        <panel classname="ShortcutPanel"/>
-        <panel classname="InstallPanel"/>
-        <panel classname="SimpleFinishPanel"/>
-    </panels>
-    
-    <!-- 
-        The packs section.
-        We specify here our packs.
-    -->
-    <packs>
-        <pack name="Base" required="yes">
-            <description>Enginuity binary files</description>
-            <file src="Enginuity.exe" targetdir="$INSTALL_PATH"/>
-            <file src="Enginuity.jar" targetdir="$INSTALL_PATH"/>
-            <file src="license.txt" targetdir="$INSTALL_PATH"/>
-            <file src="logger.xml" targetdir="$INSTALL_PATH"/>
-            <file src="logger.dtd" targetdir="$INSTALL_PATH"/>
-            <file src="profile.xml" targetdir="$INSTALL_PATH"/>
-            <file src="profile.dtd" targetdir="$INSTALL_PATH"/>
-            <file src="release notes.txt" targetdir="$INSTALL_PATH"/>
-            <file src="images" targetdir="$INSTALL_PATH"/>
-            <file src="graphics" targetdir="$INSTALL_PATH"/>
-            <file src="lib" targetdir="$INSTALL_PATH"/>
-        </pack>
-        <pack name="ECU Definitions" required="no">
-            <description>The latest official ECU definitions</description>
-            <file src="ecu_defs.xml" targetdir="$INSTALL_PATH"/>
-        </pack>
-        <pack name="Source Files" required="no">
-            <description>Enginuity Source Files</description>
-            <file src="src" targetdir="$INSTALL_PATH"/>
-        </pack>
-    </packs>
-    
-</installation>