New FHS: jars in jar/

9 files changed, 171 insertions, 171 deletions

diff --git a/jnlp-files/applet-version-jnlp.html b/jnlp-files/applet-version-jnlp.html
index ec4d9a0fc..2583621d1 100644
--- a/jnlp-files/applet-version-jnlp.html
+++ b/jnlp-files/applet-version-jnlp.html
@@ -18,9 +18,9 @@ JNLP Applet with AppletLauncher fallback version.
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=800
       height=600
-      archive="JOGL_CODEBASE_TAG/../util/applet-launcher.jar,
-               JOGL_CODEBASE_TAG/jogl.all.jar,
-               JOGL_CODEBASE_TAG/gluegen-rt.jar">
+      archive="JOGL_CODEBASE_TAG/jar/applet-launcher.jar,
+               JOGL_CODEBASE_TAG/jar/jogl.all.jar,
+               JOGL_CODEBASE_TAG/jar/gluegen-rt.jar">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="jogamp.newt.driver.awt.opengl.VersionApplet">
    <param name="subapplet.displayname" value="JOGL Applet Version">
diff --git a/jnlp-files/applet-version-lancheronly.html b/jnlp-files/applet-version-lancheronly.html
index e172091aa..4bcf64081 100644
--- a/jnlp-files/applet-version-lancheronly.html
+++ b/jnlp-files/applet-version-lancheronly.html
@@ -18,9 +18,9 @@ AppletLauncher only version.
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=800
       height=600
-      archive="JOGL_CODEBASE_TAG/../util/applet-launcher.jar,
-               JOGL_CODEBASE_TAG/jogl.all.jar,
-               JOGL_CODEBASE_TAG/gluegen-rt.jar">
+      archive="JOGL_CODEBASE_TAG/jar/applet-launcher.jar,
+               JOGL_CODEBASE_TAG/jar/jogl.all.jar,
+               JOGL_CODEBASE_TAG/jar/gluegen-rt.jar">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="jogamp.newt.driver.awt.opengl.VersionApplet">
    <param name="subapplet.displayname" value="JOGL Applet Version">
diff --git a/jnlp-files/atomic/nativewindow-all-awt.jnlp b/jnlp-files/atomic/nativewindow-all-awt.jnlp
index bdda477ef..2e9134d20 100644
--- a/jnlp-files/atomic/nativewindow-all-awt.jnlp
+++ b/jnlp-files/atomic/nativewindow-all-awt.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
+<jnlp codebase="JOGL_CODEBASE_TAG"
       href="nativewindow-all-awt.jnlp" version="JOGAMP_VERSION">
   <information>
     <title>Java(tm) NativeWindow Interface API (ALL.AWT)</title>
@@ -14,58 +14,58 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.core.jar" />
-      <jar href="nativewindow.awt.jar"/>
+      <jar href="jar/nativewindow.core.jar" />
+      <jar href="jar/nativewindow.awt.jar"/>
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <nativelib href = "nativewindow-natives-windows-i586.jar" />
+      <nativelib href = "jar/nativewindow-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
+      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
+      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <nativelib href = "nativewindow-natives-solaris-sparc.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <nativelib href = "nativewindow-natives-solaris-i586.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <nativelib href = "nativewindow-natives-linux-i586.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <nativelib href = "nativewindow-natives-linux-i586.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
+      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
+      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/atomic/nativewindow.jnlp b/jnlp-files/atomic/nativewindow.jnlp
index 109be0373..8d8c69fc9 100644
--- a/jnlp-files/atomic/nativewindow.jnlp
+++ b/jnlp-files/atomic/nativewindow.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
+<jnlp codebase="JOGL_CODEBASE_TAG"
       href="nativewindow.jnlp" version="JOGAMP_VERSION">
   <information>
     <title>Java(tm) NativeWindow Interface API (CORE)</title>
@@ -14,69 +14,69 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.core.jar" />
+      <jar href="jar/nativewindow.core.jar" />
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <jar href="nativewindow.os.win.jar" />
-      <nativelib href = "nativewindow-natives-windows-i586.jar" />
+      <jar href="jar/nativewindow.os.win.jar" />
+      <nativelib href = "jar/nativewindow-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <jar href="nativewindow.os.win.jar" />
-      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
+      <jar href="jar/nativewindow.os.win.jar" />
+      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <jar href="nativewindow.os.win.jar" />
-      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
+      <jar href="jar/nativewindow.os.win.jar" />
+      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-solaris-sparc.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-solaris-i586.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-linux-i586.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-linux-i586.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <jar href="nativewindow.os.x11.jar" />
-      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
+      <jar href="jar/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
+      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
+      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/atomic/newt-all-awt.jnlp b/jnlp-files/atomic/newt-all-awt.jnlp
index 378e2270e..8e56b52f2 100644
--- a/jnlp-files/atomic/newt-all-awt.jnlp
+++ b/jnlp-files/atomic/newt-all-awt.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
+<jnlp codebase="JOGL_CODEBASE_TAG"
       href="newt-all-awt.jnlp" version="JOGAMP_VERSION">
   <information>
     <title>NEWT - New Windowing Toolkit (AWT)</title>
@@ -14,72 +14,72 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.core.jar" />
-      <jar href="newt.awt.jar" />
+      <jar href="jar/newt.core.jar" />
+      <jar href="jar/newt.awt.jar" />
       <extension name="nativewindow-all-awt" href="JOGL_CODEBASE_TAG/nativewindow-all-awt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <jar href="newt.driver.win.jar" />
-      <nativelib href = "newt-natives-windows-i586.jar" />
+      <jar href="jar/newt.driver.win.jar" />
+      <nativelib href = "jar/newt-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <jar href="newt.driver.win.jar" />
-      <nativelib href = "newt-natives-windows-amd64.jar" />
+      <jar href="jar/newt.driver.win.jar" />
+      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <jar href="newt.driver.win.jar" />
-      <nativelib href = "newt-natives-windows-amd64.jar" />
+      <jar href="jar/newt.driver.win.jar" />
+      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-sparc.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-sparcv9.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-i586.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-i586.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-i586.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <nativelib href = "newt-natives-linux-armv7.jar" />
+      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <nativelib href = "newt-natives-linux-armv7.jar" />
+      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <jar href="newt.driver.osx.jar" />
-      <nativelib href = "newt-natives-macosx-universal.jar" />
+      <jar href="jar/newt.driver.osx.jar" />
+      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <jar href="newt.driver.osx.jar" />
-      <nativelib href = "newt-natives-macosx-universal.jar" />
+      <jar href="jar/newt.driver.osx.jar" />
+      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/atomic/newt.jnlp b/jnlp-files/atomic/newt.jnlp
index 914d9dcf2..55fc12ae6 100644
--- a/jnlp-files/atomic/newt.jnlp
+++ b/jnlp-files/atomic/newt.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
+<jnlp codebase="JOGL_CODEBASE_TAG"
       href="newt.jnlp" version="JOGAMP_VERSION">
   <information>
     <title>NEWT - New Windowing Toolkit (CORE)</title>
@@ -14,71 +14,71 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.core.jar" />
+      <jar href="jar/newt.core.jar" />
       <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <jar href="newt.driver.win.jar" />
-      <nativelib href = "newt-natives-windows-i586.jar" />
+      <jar href="jar/newt.driver.win.jar" />
+      <nativelib href = "jar/newt-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <jar href="newt.driver.win.jar" />
-      <nativelib href = "newt-natives-windows-amd64.jar" />
+      <jar href="jar/newt.driver.win.jar" />
+      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <jar href="newt.driver.win.jar" />
-      <nativelib href = "newt-natives-windows-amd64.jar" />
+      <jar href="jar/newt.driver.win.jar" />
+      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-sparc.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-sparcv9.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-i586.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-solaris-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-i586.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-i586.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <jar href="newt.driver.x11.jar" />
-      <nativelib href = "newt-natives-linux-amd64.jar" />
+      <jar href="jar/newt.driver.x11.jar" />
+      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <nativelib href = "newt-natives-linux-armv7.jar" />
+      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <nativelib href = "newt-natives-linux-armv7.jar" />
+      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <jar href="newt.driver.osx.jar" />
-      <nativelib href = "newt-natives-macosx-universal.jar" />
+      <jar href="jar/newt.driver.osx.jar" />
+      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <jar href="newt.driver.osx.jar" />
-      <nativelib href = "newt-natives-macosx-universal.jar" />
+      <jar href="jar/newt.driver.osx.jar" />
+      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp
index 871464251..f287019cf 100644
--- a/jnlp-files/jogl-all-awt.jnlp
+++ b/jnlp-files/jogl-all-awt.jnlp
@@ -14,58 +14,58 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.all.jar" />
+      <jar href="jar/jogl.all.jar" />
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <nativelib href = "jogl-all-natives-windows-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <nativelib href = "jogl-all-natives-solaris-sparc.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jogl-all-natives-solaris-sparcv9.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <nativelib href = "jogl-all-natives-solaris-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <nativelib href = "jogl-all-natives-linux-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <nativelib href = "jogl-all-natives-linux-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/jogl-all-mobile.jnlp b/jnlp-files/jogl-all-mobile.jnlp
index 602a327e3..d93eb8be9 100644
--- a/jnlp-files/jogl-all-mobile.jnlp
+++ b/jnlp-files/jogl-all-mobile.jnlp
@@ -14,58 +14,58 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.all-mobile.jar" />
+      <jar href="jar/jogl.all-mobile.jar" />
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <nativelib href = "jogl-all-natives-windows-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <nativelib href = "jogl-all-natives-solaris-sparc.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jogl-all-natives-solaris-sparcv9.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <nativelib href = "jogl-all-natives-solaris-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <nativelib href = "jogl-all-natives-linux-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <nativelib href = "jogl-all-natives-linux-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp
index 99e7816d6..43757ae32 100644
--- a/jnlp-files/jogl-all-noawt.jnlp
+++ b/jnlp-files/jogl-all-noawt.jnlp
@@ -14,58 +14,58 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.all-noawt.jar" />
+      <jar href="jar/jogl.all-noawt.jar" />
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <nativelib href = "jogl-all-natives-windows-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <nativelib href = "jogl-all-natives-solaris-sparc.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jogl-all-natives-solaris-sparcv9.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <nativelib href = "jogl-all-natives-solaris-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <nativelib href = "jogl-all-natives-linux-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <nativelib href = "jogl-all-natives-linux-i586.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />