diff --git a/core/.classpath b/core/.classpath
index d50734aa2..ac3ceedf2 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -26,9 +26,9 @@
-
-
-
-
+
+
+
+
diff --git a/core/build.xml b/core/build.xml
index 7f3ad8d0b..3b9a23777 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -95,7 +95,7 @@
-
+
diff --git a/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar
new file mode 100644
index 000000000..ee7cf4be9
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-linux-i586.jar b/core/lib/jogl/gluegen-rt-natives-linux-i586.jar
new file mode 100644
index 000000000..a7a700783
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-linux-i586.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar
new file mode 100644
index 000000000..72d86d37d
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar
new file mode 100644
index 000000000..19f62cb93
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-windows-i586.jar b/core/lib/jogl/gluegen-rt-natives-windows-i586.jar
new file mode 100644
index 000000000..713ce14c1
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-windows-i586.jar differ
diff --git a/core/lib/jogl/gluegen-rt.jar b/core/lib/jogl/gluegen-rt.jar
new file mode 100644
index 000000000..07bcb06ee
Binary files /dev/null and b/core/lib/jogl/gluegen-rt.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-linux-amd64.jar b/core/lib/jogl/jogl-all-natives-linux-amd64.jar
new file mode 100644
index 000000000..544b7d7e0
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-linux-amd64.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-linux-i586.jar b/core/lib/jogl/jogl-all-natives-linux-i586.jar
new file mode 100644
index 000000000..75165df31
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-linux-i586.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-macosx-universal.jar b/core/lib/jogl/jogl-all-natives-macosx-universal.jar
new file mode 100644
index 000000000..347583871
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-macosx-universal.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-windows-amd64.jar b/core/lib/jogl/jogl-all-natives-windows-amd64.jar
new file mode 100644
index 000000000..9dbe67cd4
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-windows-amd64.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-windows-i586.jar b/core/lib/jogl/jogl-all-natives-windows-i586.jar
new file mode 100644
index 000000000..0b03ce7c2
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-windows-i586.jar differ
diff --git a/core/lib/native/jogl.all.jar b/core/lib/jogl/jogl.all.jar
similarity index 59%
rename from core/lib/native/jogl.all.jar
rename to core/lib/jogl/jogl.all.jar
index 59a3effc7..34e9aa7d3 100644
Binary files a/core/lib/native/jogl.all.jar and b/core/lib/jogl/jogl.all.jar differ
diff --git a/core/lib/native/gluegen-rt-natives-linux-amd64.jar b/core/lib/native/gluegen-rt-natives-linux-amd64.jar
deleted file mode 100644
index 2beef199a..000000000
Binary files a/core/lib/native/gluegen-rt-natives-linux-amd64.jar and /dev/null differ
diff --git a/core/lib/native/gluegen-rt-natives-linux-i586.jar b/core/lib/native/gluegen-rt-natives-linux-i586.jar
deleted file mode 100644
index e0bc10f40..000000000
Binary files a/core/lib/native/gluegen-rt-natives-linux-i586.jar and /dev/null differ
diff --git a/core/lib/native/gluegen-rt-natives-macosx-universal.jar b/core/lib/native/gluegen-rt-natives-macosx-universal.jar
deleted file mode 100644
index 05d72f812..000000000
Binary files a/core/lib/native/gluegen-rt-natives-macosx-universal.jar and /dev/null differ
diff --git a/core/lib/native/gluegen-rt-natives-windows-amd64.jar b/core/lib/native/gluegen-rt-natives-windows-amd64.jar
deleted file mode 100644
index a77bcf115..000000000
Binary files a/core/lib/native/gluegen-rt-natives-windows-amd64.jar and /dev/null differ
diff --git a/core/lib/native/gluegen-rt-natives-windows-i586.jar b/core/lib/native/gluegen-rt-natives-windows-i586.jar
deleted file mode 100644
index 39fbfb27f..000000000
Binary files a/core/lib/native/gluegen-rt-natives-windows-i586.jar and /dev/null differ
diff --git a/core/lib/native/gluegen-rt.jar b/core/lib/native/gluegen-rt.jar
deleted file mode 100644
index de5c81508..000000000
Binary files a/core/lib/native/gluegen-rt.jar and /dev/null differ
diff --git a/core/lib/native/jogl-all-natives-linux-amd64.jar b/core/lib/native/jogl-all-natives-linux-amd64.jar
deleted file mode 100644
index 951175ba3..000000000
Binary files a/core/lib/native/jogl-all-natives-linux-amd64.jar and /dev/null differ
diff --git a/core/lib/native/jogl-all-natives-linux-i586.jar b/core/lib/native/jogl-all-natives-linux-i586.jar
deleted file mode 100644
index dd846ace0..000000000
Binary files a/core/lib/native/jogl-all-natives-linux-i586.jar and /dev/null differ
diff --git a/core/lib/native/jogl-all-natives-macosx-universal.jar b/core/lib/native/jogl-all-natives-macosx-universal.jar
deleted file mode 100644
index 3edc29505..000000000
Binary files a/core/lib/native/jogl-all-natives-macosx-universal.jar and /dev/null differ
diff --git a/core/lib/native/jogl-all-natives-windows-amd64.jar b/core/lib/native/jogl-all-natives-windows-amd64.jar
deleted file mode 100644
index 5eb5a76b6..000000000
Binary files a/core/lib/native/jogl-all-natives-windows-amd64.jar and /dev/null differ
diff --git a/core/lib/native/jogl-all-natives-windows-i586.jar b/core/lib/native/jogl-all-natives-windows-i586.jar
deleted file mode 100644
index aee77f2d8..000000000
Binary files a/core/lib/native/jogl-all-natives-windows-i586.jar and /dev/null differ