From 477dd1c88765acb35a7a6ef50bfef2aa7eb3952e Mon Sep 17 00:00:00 2001
From: Sven Meier <sven@meiers.net>
Date: Sun, 22 Jan 2012 13:38:15 +0000
Subject: [PATCH] moved core to jorgan-core, module jorgan builds zip now

---
 build.xml                         |  2 +-
 jorgan-bootstrap/.classpath       |  2 +-
 jorgan-bootstrap/build.xml        |  4 +--
 jorgan-bundle/build.xml           |  4 +--
 jorgan-core/.project              |  2 +-
 jorgan-core/build.xml             |  2 +-
 jorgan-creative/.classpath        |  2 +-
 jorgan-creative/build.xml         |  4 +--
 jorgan-customizer/.classpath      |  2 +-
 jorgan-customizer/build.xml       |  4 +--
 jorgan-executor/.classpath        |  2 +-
 jorgan-executor/build.xml         |  4 +--
 jorgan-exporter/.classpath        |  2 +-
 jorgan-exporter/build.xml         |  4 +--
 jorgan-fluidsynth/.classpath      |  2 +-
 jorgan-fluidsynth/build.xml       |  4 +--
 jorgan-graph/.classpath           |  2 +-
 jorgan-graph/build.xml            |  4 +--
 jorgan-gui/.classpath             |  2 +-
 jorgan-gui/build.xml              |  4 +--
 jorgan-importer/.classpath        |  2 +-
 jorgan-importer/build.xml         |  4 +--
 jorgan-installer/jorgan.iss       |  4 +--
 jorgan-jni/.classpath             |  2 +-
 jorgan-keyboard/.classpath        |  2 +-
 jorgan-keyboard/build.xml         |  4 +--
 jorgan-lan/.classpath             |  2 +-
 jorgan-lan/build.xml              |  4 +--
 jorgan-lcd/.classpath             |  2 +-
 jorgan-lcd/build.xml              |  4 +--
 jorgan-linuxsampler/.classpath    |  2 +-
 jorgan-linuxsampler/build.xml     |  4 +--
 jorgan-memory/.classpath          |  2 +-
 jorgan-memory/build.xml           |  4 +--
 jorgan-midimerger/.classpath      |  2 +-
 jorgan-midimerger/build.xml       |  4 +--
 jorgan-package/src/debian/install |  6 ++--
 jorgan-recorder/.classpath        |  2 +-
 jorgan-recorder/build.xml         |  4 +--
 jorgan-sams/.classpath            |  2 +-
 jorgan-sams/build.xml             |  4 +--
 jorgan-soundfont/.classpath       |  2 +-
 jorgan-soundfont/build.xml        |  4 +--
 jorgan-tools/.classpath           |  2 +-
 jorgan-tools/build.xml            |  4 +--
 jorgan/build.sh                   |  8 +++++
 jorgan/build.xml                  | 54 +++++++++++++++++++++++++++++++
 47 files changed, 130 insertions(+), 68 deletions(-)
 create mode 100755 jorgan/build.sh
 create mode 100644 jorgan/build.xml

diff --git a/build.xml b/build.xml
index 92ca786a6..2ae48c1df 100755
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <project name="jorgan-all" default="all" basedir=".">
 
   <target name="all">
-    <ant dir="jorgan"/>
+    <ant dir="jorgan-core"/>
     <ant dir="jorgan-bootstrap"/>
     <ant dir="jorgan-gui"/>
     <ant dir="jorgan-exporter"/>
diff --git a/jorgan-bootstrap/.classpath b/jorgan-bootstrap/.classpath
index 1396e247e..5224a5f9b 100644
--- a/jorgan-bootstrap/.classpath
+++ b/jorgan-bootstrap/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jorgan-bootstrap/build.xml b/jorgan-bootstrap/build.xml
index 900b1fa1a..0e4a38383 100644
--- a/jorgan-bootstrap/build.xml
+++ b/jorgan-bootstrap/build.xml
@@ -15,7 +15,7 @@
 
 		<javac debug="true" source="1.6" target="1.6" destdir="./target/classes" srcdir="./src/main/java">
 			<compilerarg value="-Xlint:all,-serial"/>
-			<classpath path="../jorgan/target/classes" />
+			<classpath path="../jorgan-core/target/classes" />
 		</javac>
 		
     	<copy todir="./target/classes">
@@ -36,7 +36,7 @@
 		        <attribute name="Implementation-Version" value="${jorgan.version}" />
 			</manifest>
 			<fileset dir="./target/classes" />
-			<fileset dir="../jorgan/target/classes">
+			<fileset dir="../jorgan-core/target/classes">
 				<include name="jorgan/util/ClassUtils.class" />
 				<include name="jorgan/util/IOUtils.class" />
 			</fileset>
diff --git a/jorgan-bundle/build.xml b/jorgan-bundle/build.xml
index 404ded51e..f381acbe5 100644
--- a/jorgan-bundle/build.xml
+++ b/jorgan-bundle/build.xml
@@ -23,7 +23,7 @@
         <mkdir dir="${image}/jOrgan.app/Contents/Resources/Java"/>
         <copy todir="${image}/jOrgan.app/Contents/Resources/Java">
             <fileset dir="../jorgan-bootstrap/target/marshal" includes="jorgan.jar" />
-            <fileset dir="../jorgan/target/marshal" includes="lib/**" /> 
+            <fileset dir="../jorgan-core/target/marshal" includes="lib/**" /> 
             <fileset dir="../jorgan-gui/target/marshal" includes="lib/**" /> 
             <fileset dir="../jorgan-customizer/target/marshal" includes="lib/**" />
             <fileset dir="../jorgan-executor/target/marshal" includes="lib/**" />
@@ -44,7 +44,7 @@
           
         <mkdir dir="${image}/dispositions" />
         <copy todir="${image}">
-            <fileset dir="../jorgan/target/marshal" includes="dispositions/**" />          
+            <fileset dir="../jorgan-core/target/marshal" includes="dispositions/**" />          
             <fileset dir="../jorgan-executor/target/marshal" includes="dispositions/**" />
             <fileset dir="../jorgan-fluidsynth/target/marshal" includes="dispositions/**" />
             <fileset dir="../jorgan-lan/target/marshal" includes="dispositions/**" />
diff --git a/jorgan-core/.project b/jorgan-core/.project
index d56d905f1..0eefcd9a4 100644
--- a/jorgan-core/.project
+++ b/jorgan-core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jorgan</name>
+	<name>jorgan-core</name>
 	<comment>Java Virtual Pipe Organ</comment>
 	<projects>
 	</projects>
diff --git a/jorgan-core/build.xml b/jorgan-core/build.xml
index 1a9908e5a..cd0c97d53 100644
--- a/jorgan-core/build.xml
+++ b/jorgan-core/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="jorgan" default="dist" basedir=".">
+<project name="jorgan-core" default="dist" basedir=".">
 
     <property file="../build.properties"/>
 	
diff --git a/jorgan-creative/.classpath b/jorgan-creative/.classpath
index 033ee9b16..a7148eb26 100644
--- a/jorgan-creative/.classpath
+++ b/jorgan-creative/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-importer"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-jni"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
diff --git a/jorgan-creative/build.xml b/jorgan-creative/build.xml
index 20c2aea0f..523acd730 100644
--- a/jorgan-creative/build.xml
+++ b/jorgan-creative/build.xml
@@ -10,11 +10,11 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath path="../jorgan-importer/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-customizer/.classpath b/jorgan-customizer/.classpath
index ac2ff0821..ffe9bd00c 100644
--- a/jorgan-customizer/.classpath
+++ b/jorgan-customizer/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-customizer/build.xml b/jorgan-customizer/build.xml
index 71d6030cd..76cfc33ac 100644
--- a/jorgan-customizer/build.xml
+++ b/jorgan-customizer/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-executor/.classpath b/jorgan-executor/.classpath
index b740fbe33..4d1bfad00 100644
--- a/jorgan-executor/.classpath
+++ b/jorgan-executor/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-executor/build.xml b/jorgan-executor/build.xml
index 36d51861f..c7bc2c43c 100644
--- a/jorgan-executor/build.xml
+++ b/jorgan-executor/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-exporter/.classpath b/jorgan-exporter/.classpath
index ac2ff0821..ffe9bd00c 100644
--- a/jorgan-exporter/.classpath
+++ b/jorgan-exporter/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-exporter/build.xml b/jorgan-exporter/build.xml
index 28c975d73..ac80d4ff5 100644
--- a/jorgan-exporter/build.xml
+++ b/jorgan-exporter/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-fluidsynth/.classpath b/jorgan-fluidsynth/.classpath
index 892ca7270..97c75beac 100644
--- a/jorgan-fluidsynth/.classpath
+++ b/jorgan-fluidsynth/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-customizer"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-jni"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
diff --git a/jorgan-fluidsynth/build.xml b/jorgan-fluidsynth/build.xml
index c96ec8cf6..bc6c9655f 100644
--- a/jorgan-fluidsynth/build.xml
+++ b/jorgan-fluidsynth/build.xml
@@ -10,11 +10,11 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath path="../jorgan-customizer/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-graph/.classpath b/jorgan-graph/.classpath
index da6963654..a2b49c829 100644
--- a/jorgan-graph/.classpath
+++ b/jorgan-graph/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry exported="true" kind="lib" path="lib/gj-core.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gj-layouts.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gj-ui.jar"/>
diff --git a/jorgan-graph/build.xml b/jorgan-graph/build.xml
index c5794f02e..1f26d1a0d 100644
--- a/jorgan-graph/build.xml
+++ b/jorgan-graph/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-gui/.classpath b/jorgan-gui/.classpath
index 4db4594a4..16eb4f351 100644
--- a/jorgan-gui/.classpath
+++ b/jorgan-gui/.classpath
@@ -6,6 +6,6 @@
 	<classpathentry kind="lib" path="lib/AppleJavaExtensions.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jorgan-gui/build.xml b/jorgan-gui/build.xml
index c833b16dd..d3e0848b2 100644
--- a/jorgan-gui/build.xml
+++ b/jorgan-gui/build.xml
@@ -12,9 +12,9 @@
 
     	<javac debug="true" source="1.6" target="1.6" destdir="./target/classes" srcdir="./src/main/java">
         	<compilerarg value="-Xlint:all,-serial"/>
-			<classpath path="../jorgan/target/classes" />
+			<classpath path="../jorgan-core/target/classes" />
         	<classpath>
-                <fileset dir="../jorgan/lib">
+                <fileset dir="../jorgan-core/lib">
     	            <include name="*" />
                 </fileset>
 			    <fileset dir="./lib">
diff --git a/jorgan-importer/.classpath b/jorgan-importer/.classpath
index ac2ff0821..ffe9bd00c 100644
--- a/jorgan-importer/.classpath
+++ b/jorgan-importer/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-importer/build.xml b/jorgan-importer/build.xml
index fa07f67cd..248cd0c99 100644
--- a/jorgan-importer/build.xml
+++ b/jorgan-importer/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-installer/jorgan.iss b/jorgan-installer/jorgan.iss
index 8ae86780b..667489954 100644
--- a/jorgan-installer/jorgan.iss
+++ b/jorgan-installer/jorgan.iss
@@ -18,7 +18,7 @@ OutputDir=.\target
 DefaultDirName={pf}\jOrgan
 DefaultGroupName=jOrgan
 DisableProgramGroupPage=no
-LicenseFile=..\jorgan\docs\license.txt
+LicenseFile=..\jorgan-core\docs\license.txt
 SetupIconFile=.\src\jorgan.ico
 Compression=lzma
 SolidCompression=yes
@@ -64,7 +64,7 @@ Name: "skins"; Description: "Skins"; Types: standard
 Source: ".\target\jOrgan.exe"; DestDir: "{app}"; Components: core
 Source: ".\src\jOrgan.l4j.ini"; DestDir: "{app}"; Components: core
 Source: "..\jorgan-bootstrap\target\marshal\*"; DestDir: "{app}"; Components: core; Flags: recursesubdirs createallsubdirs
-Source: "..\jorgan\target\marshal\*"; DestDir: "{app}"; Components: core; Flags: recursesubdirs createallsubdirs
+Source: "..\jorgan-core\target\marshal\*"; DestDir: "{app}"; Components: core; Flags: recursesubdirs createallsubdirs
 Source: "..\jorgan-gui\target\marshal\*"; DestDir: "{app}"; Components: gui; Flags: recursesubdirs createallsubdirs
 Source: "..\jorgan-creative\target\marshal\*"; DestDir: "{app}"; Components: creative; Flags: recursesubdirs createallsubdirs
 Source: "..\jorgan-customizer\target\marshal\*"; DestDir: "{app}"; Components: customizer; Flags: recursesubdirs createallsubdirs
diff --git a/jorgan-jni/.classpath b/jorgan-jni/.classpath
index ccddecc5f..cd196b4e0 100644
--- a/jorgan-jni/.classpath
+++ b/jorgan-jni/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jorgan-keyboard/.classpath b/jorgan-keyboard/.classpath
index ac2ff0821..ffe9bd00c 100755
--- a/jorgan-keyboard/.classpath
+++ b/jorgan-keyboard/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-keyboard/build.xml b/jorgan-keyboard/build.xml
index 0baa011b4..d44e6cb6c 100755
--- a/jorgan-keyboard/build.xml
+++ b/jorgan-keyboard/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-lan/.classpath b/jorgan-lan/.classpath
index 2e94d5c72..4b10144ed 100644
--- a/jorgan-lan/.classpath
+++ b/jorgan-lan/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-lan/build.xml b/jorgan-lan/build.xml
index 8d25af1d4..d0b3524f0 100644
--- a/jorgan-lan/build.xml
+++ b/jorgan-lan/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-lcd/.classpath b/jorgan-lcd/.classpath
index 2e94d5c72..4b10144ed 100644
--- a/jorgan-lcd/.classpath
+++ b/jorgan-lcd/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-lcd/build.xml b/jorgan-lcd/build.xml
index 4ed0fbe29..96483a5ea 100644
--- a/jorgan-lcd/build.xml
+++ b/jorgan-lcd/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-linuxsampler/.classpath b/jorgan-linuxsampler/.classpath
index b740fbe33..4d1bfad00 100644
--- a/jorgan-linuxsampler/.classpath
+++ b/jorgan-linuxsampler/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-linuxsampler/build.xml b/jorgan-linuxsampler/build.xml
index 7b0f712c8..9a11531a9 100644
--- a/jorgan-linuxsampler/build.xml
+++ b/jorgan-linuxsampler/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-memory/.classpath b/jorgan-memory/.classpath
index 9bba42d70..582831c49 100644
--- a/jorgan-memory/.classpath
+++ b/jorgan-memory/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-exporter"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-lcd"/>
diff --git a/jorgan-memory/build.xml b/jorgan-memory/build.xml
index 636ca2e32..bbbd3d3d3 100644
--- a/jorgan-memory/build.xml
+++ b/jorgan-memory/build.xml
@@ -10,12 +10,12 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath path="../jorgan-exporter/target/classes" />
   		<classpath path="../jorgan-lcd/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-midimerger/.classpath b/jorgan-midimerger/.classpath
index ac2ff0821..ffe9bd00c 100755
--- a/jorgan-midimerger/.classpath
+++ b/jorgan-midimerger/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-midimerger/build.xml b/jorgan-midimerger/build.xml
index 723b4a123..77dbcc4de 100755
--- a/jorgan-midimerger/build.xml
+++ b/jorgan-midimerger/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-package/src/debian/install b/jorgan-package/src/debian/install
index 0dcf20702..739d57724 100644
--- a/jorgan-package/src/debian/install
+++ b/jorgan-package/src/debian/install
@@ -3,9 +3,9 @@ debian/input/jorgan.desktop /usr/share/applications
 debian/input/icons/* /usr/share/icons
 debian/input/copyright /usr/share/doc/jorgan
 ../../jorgan-bootstrap/target/marshal/jorgan.jar /usr/lib/jorgan
-../../jorgan/docs/* /usr/share/doc/jorgan
-../../jorgan/target/marshal/lib/* /usr/lib/jorgan/lib
-../../jorgan/target/marshal/dispositions/* /usr/share/jorgan/dispositions
+../../jorgan-core/docs/* /usr/share/doc/jorgan
+../../jorgan-core/target/marshal/lib/* /usr/lib/jorgan/lib
+../../jorgan-core/target/marshal/dispositions/* /usr/share/jorgan/dispositions
 ../../jorgan-gui/target/marshal/lib/* /usr/lib/jorgan/lib
 ../../jorgan-creative/target/marshal/lib/* /usr/lib/jorgan/lib
 ../../jorgan-creative/target/marshal/dispositions/* /usr/share/jorgan/dispositions
diff --git a/jorgan-recorder/.classpath b/jorgan-recorder/.classpath
index 2e94d5c72..4b10144ed 100644
--- a/jorgan-recorder/.classpath
+++ b/jorgan-recorder/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jorgan-recorder/build.xml b/jorgan-recorder/build.xml
index eb8d53687..c9d9a3f8a 100644
--- a/jorgan-recorder/build.xml
+++ b/jorgan-recorder/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-sams/.classpath b/jorgan-sams/.classpath
index e4293615b..1940c16ee 100755
--- a/jorgan-sams/.classpath
+++ b/jorgan-sams/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
diff --git a/jorgan-sams/build.xml b/jorgan-sams/build.xml
index 8651c146a..dc41e9d34 100755
--- a/jorgan-sams/build.xml
+++ b/jorgan-sams/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-soundfont/.classpath b/jorgan-soundfont/.classpath
index 55acb9eee..ae036fbbd 100644
--- a/jorgan-soundfont/.classpath
+++ b/jorgan-soundfont/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-importer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-gui"/>
diff --git a/jorgan-soundfont/build.xml b/jorgan-soundfont/build.xml
index 40e7e2c49..d770a1284 100644
--- a/jorgan-soundfont/build.xml
+++ b/jorgan-soundfont/build.xml
@@ -10,11 +10,11 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath path="../jorgan-importer/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">
diff --git a/jorgan-tools/.classpath b/jorgan-tools/.classpath
index ff2db08fb..97f13661f 100644
--- a/jorgan-tools/.classpath
+++ b/jorgan-tools/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jorgan-tools/build.xml b/jorgan-tools/build.xml
index 2fc4efb2c..8cfe353b6 100644
--- a/jorgan-tools/build.xml
+++ b/jorgan-tools/build.xml
@@ -10,9 +10,9 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
    		</classpath>
diff --git a/jorgan/build.sh b/jorgan/build.sh
new file mode 100755
index 000000000..178262331
--- /dev/null
+++ b/jorgan/build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+ant -buildfile ../build.xml
+
+ant
+
diff --git a/jorgan/build.xml b/jorgan/build.xml
new file mode 100644
index 000000000..c174a409a
--- /dev/null
+++ b/jorgan/build.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jorgan-bundle" default="dist" basedir=".">
+
+    <property file="../build.properties"/>
+	
+    <target name="clean" description="Cleanup target directory">
+        <delete dir="./target"/>
+    </target>
+
+    <target name="dist" description="Set up the distribution" depends="clean" >
+        <mkdir dir="./target/marshal"/>
+        <copy todir="./target/marshal">
+            <fileset dir="../jorgan-bootstrap/target/marshal" includes="jorgan.jar" />
+            <fileset dir="../jorgan-core/target/marshal" includes="lib/**" /> 
+            <fileset dir="../jorgan-gui/target/marshal" includes="lib/**" /> 
+            <fileset dir="../jorgan-customizer/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-executor/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-keyboard/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-importer/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-exporter/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-lan/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-lcd/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-linuxsampler/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-memory/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-midimerger/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-recorder/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-sams/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-soundfont/target/marshal" includes="lib/**" />
+            <fileset dir="../jorgan-tools/target/marshal" includes="lib/**" />
+        </copy>
+          
+        <mkdir dir="./target/marshal/dispositions" />
+        <copy todir="./target/marshal">
+            <fileset dir="../jorgan-core/target/marshal" includes="dispositions/**" />          
+            <fileset dir="../jorgan-executor/target/marshal" includes="dispositions/**" />
+            <fileset dir="../jorgan-lan/target/marshal" includes="dispositions/**" />
+            <fileset dir="../jorgan-lcd/target/marshal" includes="dispositions/**" />
+            <fileset dir="../jorgan-memory/target/marshal" includes="dispositions/**" />
+            <fileset dir="../jorgan-recorder/target/marshal" includes="dispositions/**" />
+            <fileset dir="../jorgan-sams/target/marshal" includes="dispositions/**" />
+        </copy>
+
+        <mkdir dir="./target/marshal/skins" />
+        <copy todir="./target/marshal">
+          <fileset dir="../jorgan-skins/target/marshal" includes="skins/**" />          
+        </copy>
+
+        <zip destfile="./target/jorgan-${jorgan.version}.zip">
+            <fileset dir="./target/marshal">
+                <include name="*"/>
+            </fileset>
+        </zip>
+    </target>
+</project>