60 files changed, 303 insertions, 310 deletions
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Audio.java
index fe77c7c48..2b51be164 100755
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Audio.java
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Audio.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.javafx.audio.windows.waveout;
+package com.jogamp.audio.windows.waveout;
 
 import java.io.*;
 
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Mixer.java
index 59877052f..60972873e 100755
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Mixer.java
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Mixer.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.javafx.audio.windows.waveout;
+package com.jogamp.audio.windows.waveout;
 
 import java.io.*;
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/SoundBuffer.java
index 6b75450eb..c45430d23 100755
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/SoundBuffer.java
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/SoundBuffer.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.javafx.audio.windows.waveout;
+package com.jogamp.audio.windows.waveout;
 
 import java.io.*;
 
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/TestSpatialization.java
index 38e3bb808..78fb3493f 100755
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/TestSpatialization.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.javafx.audio.windows.waveout;
+package com.jogamp.audio.windows.waveout;
 
 import java.io.*;
 import javax.media.nativewindow.NativeWindow;
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Track.java
index 40c39e755..b57bf1dc6 100755
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Track.java
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Track.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.javafx.audio.windows.waveout;
+package com.jogamp.audio.windows.waveout;
 
 import java.io.*;
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java b/src/jogl/classes/com/jogamp/audio/windows/waveout/Vec3f.java
index 5b480a513..1afdaf081 100755
--- a/src/jogl/classes/com/jogamp/javafx/audio/windows/waveout/Vec3f.java
+++ b/src/jogl/classes/com/jogamp/audio/windows/waveout/Vec3f.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.javafx.audio.windows.waveout;
+package com.jogamp.audio.windows.waveout;
 
 /** 3-element single-precision vector */
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
index c03ee8e30..6e5bd2eb2 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -7,7 +7,7 @@ package com.jogamp.opengl.util.glsl.fixedfunc.impl;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 import javax.media.opengl.glu.*;
-import com.jogamp.gluegen.runtime.BufferFactory;
+import com.jogamp.gluegen.runtime.Buffers;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
 import java.nio.*;
@@ -206,8 +206,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glVertexPointer(gl, array);
@@ -234,8 +234,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glColorPointer(gl, array);
@@ -265,8 +265,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glNormalPointer(gl, array);
@@ -293,8 +293,8 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun
           if(gl.glIsVBOArrayEnabled()) {
             throw new GLException("VBO array is not disabled: "+array);
           }
-          BufferFactory.rangeCheck(array.getBuffer(), 1);
-          if (!BufferFactory.isDirect(array.getBuffer())) {
+          Buffers.rangeCheck(array.getBuffer(), 1);
+          if (!Buffers.isDirect(array.getBuffer())) {
             throw new GLException("Argument \"pointer\" was not a direct buffer"); }
       }
       fixedFunction.glTexCoordPointer(gl, array);
diff --git a/src/jogl/native/audio/Mixer.cpp b/src/jogl/native/audio/Mixer.cpp
index 821a03246..9fa5b61bc 100755
--- a/src/jogl/native/audio/Mixer.cpp
+++ b/src/jogl/native/audio/Mixer.cpp
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <mmsystem.h>
 #include <mmreg.h>
-#include "com_jogamp_javafx_audio_windows_waveout_Mixer.h"
+#include "com_jogamp_audio_windows_waveout_Mixer.h"
 
 static HANDLE event = NULL;
 static HWAVEOUT output = NULL;
@@ -57,7 +57,7 @@ void CALLBACK playbackCallback(HWAVEOUT output,
     }
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_initializeWaveOut
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_initializeWaveOut
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     event = (HANDLE) eventObject;
@@ -98,7 +98,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_in
     return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_shutdownWaveOut
+JNIEXPORT void JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_shutdownWaveOut
   (JNIEnv *env, jclass unused)
 {
     //    writeString("Pausing\n");
@@ -109,7 +109,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_shutdo
     waveOutClose(output);
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getNextMixerBuffer
+JNIEXPORT jlong JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getNextMixerBuffer
   (JNIEnv *env, jclass unused)
 {
     WAVEHDR* hdr = NULL;
@@ -123,28 +123,28 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getNe
     return (jlong) hdr;
 }
 
-JNIEXPORT jobject JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferData
+JNIEXPORT jobject JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getMixerBufferData
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return env->NewDirectByteBuffer(hdr->lpData, hdr->dwBufferLength);
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferDataAddress
+JNIEXPORT jlong JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getMixerBufferDataAddress
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return (jlong) hdr->lpData;
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_getMixerBufferDataCapacity
+JNIEXPORT jint JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_getMixerBufferDataCapacity
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     WAVEHDR* hdr = (WAVEHDR*) mixerBuffer;
     return (jint) hdr->dwBufferLength;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_prepareMixerBuffer
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_prepareMixerBuffer
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     MMRESULT res = waveOutPrepareHeader(output,
@@ -156,7 +156,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_pr
     return JNI_FALSE;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_writeMixerBuffer
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_writeMixerBuffer
   (JNIEnv *env, jclass unused, jlong mixerBuffer)
 {
     MMRESULT res = waveOutWrite(output,
@@ -170,13 +170,13 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_wr
     return JNI_FALSE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_CreateEvent
+JNIEXPORT jlong JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_CreateEvent
   (JNIEnv *env, jclass unused)
 {
     return (jlong) CreateEvent(NULL, FALSE, TRUE, NULL);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_WaitForSingleObject
+JNIEXPORT jboolean JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_WaitForSingleObject
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     DWORD res = WaitForSingleObject((HANDLE) eventObject, INFINITE);
@@ -186,13 +186,13 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_Wa
     return JNI_FALSE;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_SetEvent
+JNIEXPORT void JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_SetEvent
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     SetEvent((HANDLE) eventObject);
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_audio_windows_waveout_Mixer_CloseHandle
+JNIEXPORT void JNICALL Java_com_jogamp_audio_windows_waveout_Mixer_CloseHandle
   (JNIEnv *env, jclass unused, jlong eventObject)
 {
     CloseHandle((HANDLE) eventObject);
diff --git a/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c b/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
index 1ca973097..5317c2abc 100644
--- a/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
+++ b/src/jogl/native/openmax/com_sun_openmax_OMXInstance.c
@@ -1,5 +1,5 @@
 /*
- *  javafx_media_video_Movie.c
+ *  media_video_Movie.c
  *  JFXFramework
  *
  *  Created by sun on 17/02/08.
@@ -21,8 +21,8 @@ static const char * const ClazzNameRuntimeException =
                             "java/lang/RuntimeException";
 static jclass    runtimeExceptionClz=NULL;
 #ifdef _WIN32_WCE
-    #define STDOUT_FILE "\\Storage Card\\javafx_demos\\stdout.txt"
-    #define STDERR_FILE "\\Storage Card\\javafx_demos\\stderr.txt"
+    #define STDOUT_FILE "\\Storage Card\\demos\\stdout.txt"
+    #define STDERR_FILE "\\Storage Card\\demos\\stderr.txt"
 #endif
 
 static void _initStatics(JNIEnv *env)
diff --git a/src/nativewindow/classes/javax/media/nativewindow/package.html b/src/nativewindow/classes/javax/media/nativewindow/package.html
index d30b4a8df..fa422b2ab 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/package.html
+++ b/src/nativewindow/classes/javax/media/nativewindow/package.html
@@ -41,7 +41,7 @@
   </ul><br>
   This protocol <i>does not</i> describe how to <i>create</i> native windows, but how to <i>bind</i> a native window to an implementation of
   {@link javax.media.nativewindow.NativeWindow NativeWindow}.<br>
-  However, an implementation of this protocol (e.g. {@link com.jogamp.javafx.newt}) may support the creation.<br>
+  However, an implementation of this protocol (e.g. {@link com.jogamp.newt}) may support the creation.<br>
    
 <h3>Dependencies</h3>
   This binding has dependencies to the following:<br><br>
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Display.java b/src/newt/classes/com/jogamp/newt/Display.java
index 5c5db0338..88f6dd34b 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/Display.java
+++ b/src/newt/classes/com/jogamp/newt/Display.java
@@ -31,11 +31,11 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 import javax.media.nativewindow.*;
-import com.jogamp.javafx.newt.impl.Debug;
-import com.jogamp.javafx.newt.util.EventDispatchThread;
+import com.jogamp.newt.impl.Debug;
+import com.jogamp.newt.util.EventDispatchThread;
 import java.util.*;
 
 public abstract class Display {
@@ -47,15 +47,15 @@ public abstract class Display {
         Class displayClass = NewtFactory.getCustomClass(type, "Display");
         if(null==displayClass) {
             if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDDisplay");
+                displayClass = Class.forName("com.jogamp.newt.opengl.kd.KDDisplay");
             } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsDisplay");
+                displayClass = Class.forName("com.jogamp.newt.windows.WindowsDisplay");
             } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.macosx.MacDisplay");
+                displayClass = Class.forName("com.jogamp.newt.macosx.MacDisplay");
             } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.x11.X11Display");
+                displayClass = Class.forName("com.jogamp.newt.x11.X11Display");
             } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                displayClass = Class.forName("com.jogamp.javafx.newt.awt.AWTDisplay");
+                displayClass = Class.forName("com.jogamp.newt.awt.AWTDisplay");
             } else {
                 throw new RuntimeException("Unknown display type \"" + type + "\"");
             }
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Event.java b/src/newt/classes/com/jogamp/newt/Event.java
index 4274454ab..d42a95735 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/Event.java
+++ b/src/newt/classes/com/jogamp/newt/Event.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public class Event {
     private boolean isSystemEvent;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/EventListener.java b/src/newt/classes/com/jogamp/newt/EventListener.java
index 065cc1de3..75cb487dd 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/EventListener.java
+++ b/src/newt/classes/com/jogamp/newt/EventListener.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public interface EventListener
 {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java b/src/newt/classes/com/jogamp/newt/InputEvent.java
index 0cfaaa4c0..d4c3f6905 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/InputEvent.java
+++ b/src/newt/classes/com/jogamp/newt/InputEvent.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public abstract class InputEvent extends Event
 {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Insets.java b/src/newt/classes/com/jogamp/newt/Insets.java
index 5c91847f4..e440892f0 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/Insets.java
+++ b/src/newt/classes/com/jogamp/newt/Insets.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  *
  */
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 /**
  * Simple class representing insets.
diff --git a/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java b/src/newt/classes/com/jogamp/newt/KeyEvent.java
index 8ae92464c..bec77160b 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/KeyEvent.java
+++ b/src/newt/classes/com/jogamp/newt/KeyEvent.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public class KeyEvent extends InputEvent
 {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java b/src/newt/classes/com/jogamp/newt/KeyListener.java
index 7921a0a97..28e2b833b 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/KeyListener.java
+++ b/src/newt/classes/com/jogamp/newt/KeyListener.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public interface KeyListener extends EventListener
 {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java b/src/newt/classes/com/jogamp/newt/MouseEvent.java
index 82989e216..d5412c0cc 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/MouseEvent.java
+++ b/src/newt/classes/com/jogamp/newt/MouseEvent.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public class MouseEvent extends InputEvent
 {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java b/src/newt/classes/com/jogamp/newt/MouseListener.java
index a0d42f738..6d931dd31 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/MouseListener.java
+++ b/src/newt/classes/com/jogamp/newt/MouseListener.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public interface MouseListener extends EventListener
 {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java b/src/newt/classes/com/jogamp/newt/NewtFactory.java
index aae51aaf6..2a696aa07 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/NewtFactory.java
+++ b/src/newt/classes/com/jogamp/newt/NewtFactory.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 import javax.media.nativewindow.*;
 import java.util.ArrayList;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java b/src/newt/classes/com/jogamp/newt/OffscreenWindow.java
index 015e9b8d2..c9c56fc61 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/OffscreenWindow.java
+++ b/src/newt/classes/com/jogamp/newt/OffscreenWindow.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 import javax.media.nativewindow.*;
 
diff --git a/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java b/src/newt/classes/com/jogamp/newt/PaintEvent.java
index 8543246a7..51c43725a 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/PaintEvent.java
+++ b/src/newt/classes/com/jogamp/newt/PaintEvent.java
@@ -31,7 +31,7 @@
  *
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 /**
  *
diff --git a/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java b/src/newt/classes/com/jogamp/newt/PaintListener.java
index adfd78f18..6fbc9c8fc 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/PaintListener.java
+++ b/src/newt/classes/com/jogamp/newt/PaintListener.java
@@ -31,7 +31,7 @@
  *
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 /**
  *
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Screen.java b/src/newt/classes/com/jogamp/newt/Screen.java
index b02a7ef00..b393d30de 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/Screen.java
+++ b/src/newt/classes/com/jogamp/newt/Screen.java
@@ -31,9 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.impl.*;
 
 import javax.media.nativewindow.*;
 import java.security.*;
@@ -46,15 +46,15 @@ public abstract class Screen {
         Class screenClass = NewtFactory.getCustomClass(type, "Screen");
         if(null==screenClass) {
             if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDScreen");
+                screenClass = Class.forName("com.jogamp.newt.opengl.kd.KDScreen");
             } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsScreen");
+                screenClass = Class.forName("com.jogamp.newt.windows.WindowsScreen");
             } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.macosx.MacScreen");
+                screenClass = Class.forName("com.jogamp.newt.macosx.MacScreen");
             } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.x11.X11Screen");
+                screenClass = Class.forName("com.jogamp.newt.x11.X11Screen");
             } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                screenClass = Class.forName("com.jogamp.javafx.newt.awt.AWTScreen");
+                screenClass = Class.forName("com.jogamp.newt.awt.AWTScreen");
             } else {
                 throw new RuntimeException("Unknown window type \"" + type + "\"");
             }
diff --git a/src/newt/classes/com/jogamp/javafx/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 2d9341e13..410144653 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -31,10 +31,10 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
-import com.jogamp.javafx.newt.impl.Debug;
-import com.jogamp.javafx.newt.util.EventDispatchThread;
+import com.jogamp.newt.impl.Debug;
+import com.jogamp.newt.util.EventDispatchThread;
 
 import javax.media.nativewindow.*;
 import com.jogamp.nativewindow.impl.NWReflection;
@@ -70,15 +70,15 @@ public abstract class Window implements NativeWindow
         Class windowClass = NewtFactory.getCustomClass(type, "Window");
         if(null==windowClass) {
             if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.opengl.kd.KDWindow");
+                windowClass = Class.forName("com.jogamp.newt.opengl.kd.KDWindow");
             } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.windows.WindowsWindow");
+                windowClass = Class.forName("com.jogamp.newt.windows.WindowsWindow");
             } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.macosx.MacWindow");
+                windowClass = Class.forName("com.jogamp.newt.macosx.MacWindow");
             } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.x11.X11Window");
+                windowClass = Class.forName("com.jogamp.newt.x11.X11Window");
             } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                windowClass = Class.forName("com.jogamp.javafx.newt.awt.AWTWindow");
+                windowClass = Class.forName("com.jogamp.newt.awt.AWTWindow");
             } else {
                 throw new NativeWindowException("Unknown window type \"" + type + "\"");
             }
diff --git a/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java b/src/newt/classes/com/jogamp/newt/WindowEvent.java
index 74edfc564..1189401af 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/WindowEvent.java
+++ b/src/newt/classes/com/jogamp/newt/WindowEvent.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public class WindowEvent extends Event {
     public static final int EVENT_WINDOW_RESIZED = 100;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java b/src/newt/classes/com/jogamp/newt/WindowListener.java
index c4e79781c..0ec63435c 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/WindowListener.java
+++ b/src/newt/classes/com/jogamp/newt/WindowListener.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt;
+package com.jogamp.newt;
 
 public interface WindowListener extends EventListener {
     public void windowResized(WindowEvent e);
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java b/src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java
index fef30f385..f6ea9acc3 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTCanvas.java
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java
@@ -31,9 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.awt;
+package com.jogamp.newt.awt;
 
-import com.jogamp.javafx.newt.Window;
+import com.jogamp.newt.Window;
 
 import java.awt.Canvas;
 import java.awt.GraphicsDevice;
@@ -42,7 +42,7 @@ import java.awt.GraphicsConfiguration;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.awt.*;
-import com.jogamp.javafx.newt.impl.Debug;
+import com.jogamp.newt.impl.Debug;
 import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java b/src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java
index be36df2a4..09ce10017 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java
@@ -31,11 +31,11 @@
  * 
  */
 
-package com.jogamp.javafx.newt.awt;
+package com.jogamp.newt.awt;
 
 import java.awt.event.*;
-import com.jogamp.javafx.newt.Display;
-import com.jogamp.javafx.newt.Window;
+import com.jogamp.newt.Display;
+import com.jogamp.newt.Window;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.awt.*;
 import java.util.*;
@@ -66,20 +66,20 @@ public class AWTDisplay extends Display {
             }
             if (w != null) {
                 switch (w.getType()) {
-                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED:
-                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED:
-                    case com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
+                    case com.jogamp.newt.WindowEvent.EVENT_WINDOW_RESIZED:
+                    case com.jogamp.newt.WindowEvent.EVENT_WINDOW_MOVED:
+                    case com.jogamp.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY:
                         w.getWindow().sendWindowEvent(w.getType());
                         break;
 
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_CLICKED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED:
-                    case com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_CLICKED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_ENTERED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_EXITED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_PRESSED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_RELEASED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_MOVED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_DRAGGED:
+                    case com.jogamp.newt.MouseEvent.EVENT_MOUSE_WHEEL_MOVED:
                         {
                             MouseEvent e = (MouseEvent) w.getEvent();
                             int rotation = 0;
@@ -92,9 +92,9 @@ public class AWTDisplay extends Display {
                         }
                         break;
 
-                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_PRESSED:
-                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_RELEASED:
-                    case com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_TYPED:
+                    case com.jogamp.newt.KeyEvent.EVENT_KEY_PRESSED:
+                    case com.jogamp.newt.KeyEvent.EVENT_KEY_RELEASED:
+                    case com.jogamp.newt.KeyEvent.EVENT_KEY_TYPED:
                         {
                             KeyEvent e = (KeyEvent) w.getEvent();
                             w.getWindow().sendKeyEvent(w.getType(), convertModifiers(e),
@@ -148,19 +148,19 @@ public class AWTDisplay extends Display {
     private static int convertModifiers(InputEvent e) {
         int newtMods = 0;
         int mods = e.getModifiers();
-        if ((mods & InputEvent.SHIFT_MASK) != 0)     newtMods |= com.jogamp.javafx.newt.InputEvent.SHIFT_MASK;
-        if ((mods & InputEvent.CTRL_MASK) != 0)      newtMods |= com.jogamp.javafx.newt.InputEvent.CTRL_MASK;
-        if ((mods & InputEvent.META_MASK) != 0)      newtMods |= com.jogamp.javafx.newt.InputEvent.META_MASK;
-        if ((mods & InputEvent.ALT_MASK) != 0)       newtMods |= com.jogamp.javafx.newt.InputEvent.ALT_MASK;
-        if ((mods & InputEvent.ALT_GRAPH_MASK) != 0) newtMods |= com.jogamp.javafx.newt.InputEvent.ALT_GRAPH_MASK;
+        if ((mods & InputEvent.SHIFT_MASK) != 0)     newtMods |= com.jogamp.newt.InputEvent.SHIFT_MASK;
+        if ((mods & InputEvent.CTRL_MASK) != 0)      newtMods |= com.jogamp.newt.InputEvent.CTRL_MASK;
+        if ((mods & InputEvent.META_MASK) != 0)      newtMods |= com.jogamp.newt.InputEvent.META_MASK;
+        if ((mods & InputEvent.ALT_MASK) != 0)       newtMods |= com.jogamp.newt.InputEvent.ALT_MASK;
+        if ((mods & InputEvent.ALT_GRAPH_MASK) != 0) newtMods |= com.jogamp.newt.InputEvent.ALT_GRAPH_MASK;
         return newtMods;
     }
 
     private static int convertButton(MouseEvent e) {
         switch (e.getButton()) {
-            case MouseEvent.BUTTON1: return com.jogamp.javafx.newt.MouseEvent.BUTTON1;
-            case MouseEvent.BUTTON2: return com.jogamp.javafx.newt.MouseEvent.BUTTON2;
-            case MouseEvent.BUTTON3: return com.jogamp.javafx.newt.MouseEvent.BUTTON3;
+            case MouseEvent.BUTTON1: return com.jogamp.newt.MouseEvent.BUTTON1;
+            case MouseEvent.BUTTON2: return com.jogamp.newt.MouseEvent.BUTTON2;
+            case MouseEvent.BUTTON3: return com.jogamp.newt.MouseEvent.BUTTON3;
         }
         return 0;
     }
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java b/src/newt/classes/com/jogamp/newt/awt/AWTScreen.java
index 00da66078..c804bce06 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTScreen.java
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTScreen.java
@@ -31,9 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.awt;
+package com.jogamp.newt.awt;
 
-import com.jogamp.javafx.newt.*;
+import com.jogamp.newt.*;
 import java.awt.DisplayMode;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.awt.*;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java b/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
index a0c2b6a89..98cd64ab8 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/awt/AWTWindow.java
+++ b/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package com.jogamp.javafx.newt.awt;
+package com.jogamp.newt.awt;
 
 import java.awt.BorderLayout;
 import java.awt.Canvas;
@@ -47,7 +47,7 @@ import java.awt.event.*;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.*;
-import com.jogamp.javafx.newt.Window;
+import com.jogamp.newt.Window;
 import java.awt.Insets;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.awt.*;
@@ -204,7 +204,7 @@ public class AWTWindow extends Window {
             });
     }
 
-    public com.jogamp.javafx.newt.Insets getInsets() {
+    public com.jogamp.newt.Insets getInsets() {
         final int insets[] = new int[] { 0, 0, 0, 0 };
         runOnEDT(true, new Runnable() {
                 public void run() {
@@ -215,7 +215,7 @@ public class AWTWindow extends Window {
                     insets[3] = contInsets.right;
                 }
             });
-        return new com.jogamp.javafx.newt.
+        return new com.jogamp.newt.
             Insets(insets[0],insets[1],insets[2],insets[3]);
     }
 
@@ -324,7 +324,7 @@ public class AWTWindow extends Window {
                 x = container.getX();
                 y = container.getY();
             }
-            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_MOVED, null);
+            display.enqueueEvent(window, com.jogamp.newt.WindowEvent.EVENT_WINDOW_MOVED, null);
         }
 
         public void componentShown(ComponentEvent e) {
@@ -347,7 +347,7 @@ public class AWTWindow extends Window {
         public void componentResized(ComponentEvent e) {
             width = canvas.getWidth();
             height = canvas.getHeight();
-            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_RESIZED, null);
+            display.enqueueEvent(window, com.jogamp.newt.WindowEvent.EVENT_WINDOW_RESIZED, null);
         }
 
         public void componentMoved(ComponentEvent e) {
@@ -365,39 +365,39 @@ public class AWTWindow extends Window {
         }
 
         public void mouseEntered(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_ENTERED, e);
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_ENTERED, e);
         }
 
         public void mouseExited(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_EXITED, e);
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_EXITED, e);
         }
 
         public void mousePressed(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_PRESSED, e);
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_PRESSED, e);
         }
 
         public void mouseReleased(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_RELEASED, e);
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_RELEASED, e);
         }
 
         public void mouseMoved(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_MOVED, e);
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_MOVED, e);
         }
 
         public void mouseDragged(MouseEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.MouseEvent.EVENT_MOUSE_DRAGGED, e);
+            display.enqueueEvent(window, com.jogamp.newt.MouseEvent.EVENT_MOUSE_DRAGGED, e);
         }
 
         public void keyPressed(KeyEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_PRESSED, e);
+            display.enqueueEvent(window, com.jogamp.newt.KeyEvent.EVENT_KEY_PRESSED, e);
         }
 
         public void keyReleased(KeyEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_RELEASED, e);
+            display.enqueueEvent(window, com.jogamp.newt.KeyEvent.EVENT_KEY_RELEASED, e);
         }
 
         public void keyTyped(KeyEvent e)  {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.KeyEvent.EVENT_KEY_TYPED, e);
+            display.enqueueEvent(window, com.jogamp.newt.KeyEvent.EVENT_KEY_TYPED, e);
         }
     }
 
@@ -415,7 +415,7 @@ public class AWTWindow extends Window {
         public void windowClosed(WindowEvent e) {
         }
         public void windowClosing(WindowEvent e) {
-            display.enqueueEvent(window, com.jogamp.javafx.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY, null);
+            display.enqueueEvent(window, com.jogamp.newt.WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY, null);
         }
         public void windowDeactivated(WindowEvent e) {
         }
diff --git a/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java b/src/newt/classes/com/jogamp/newt/impl/Debug.java
index bbabe72df..62c261d2e 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/impl/Debug.java
+++ b/src/newt/classes/com/jogamp/newt/impl/Debug.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.javafx.newt.impl;
+package com.jogamp.newt.impl;
 
 import java.security.*;
 
@@ -54,7 +54,7 @@ public class Debug {
     verbose = isPropertyDefined("newt.verbose", true);
     debugAll = isPropertyDefined("newt.debug", true);
     if (verbose) {
-       Package p = Package.getPackage("com.jogamp.javafx.newt");
+       Package p = Package.getPackage("com.jogamp.newt");
        System.err.println("NEWT specification version " + p.getSpecificationVersion());
        System.err.println("NEWT implementation version " + p.getImplementationVersion());
        System.err.println("NEWT implementation vendor " + p.getImplementationVendor());
diff --git a/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java b/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java
index 9bbfc5921..52e4c0dc3 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/impl/NativeLibLoader.java
+++ b/src/newt/classes/com/jogamp/newt/impl/NativeLibLoader.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.javafx.newt.impl;
+package com.jogamp.newt.impl;
 
 // FIXME: refactor Java SE dependencies
 //import java.awt.Toolkit;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java b/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
index 3198c7511..eb93943ee 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Display.java
+++ b/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java
@@ -31,12 +31,12 @@
  * 
  */
 
-package com.jogamp.javafx.newt.intel.gdl;
+package com.jogamp.newt.intel.gdl;
 
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.impl.*;
 import javax.media.nativewindow.*;
 
-public class Display extends com.jogamp.javafx.newt.Display {
+public class Display extends com.jogamp.newt.Display {
     static int initCounter = 0;
 
     static {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java b/src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java
index a09b1e790..873d1d009 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Screen.java
+++ b/src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java
@@ -31,12 +31,12 @@
  * 
  */
 
-package com.jogamp.javafx.newt.intel.gdl;
+package com.jogamp.newt.intel.gdl;
 
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.impl.*;
 import javax.media.nativewindow.*;
 
-public class Screen extends com.jogamp.javafx.newt.Screen {
+public class Screen extends com.jogamp.newt.Screen {
 
     static {
         Display.initSingleton();
diff --git a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java b/src/newt/classes/com/jogamp/newt/intel/gdl/Window.java
index 28ffa1296..879fc6134 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/intel/gdl/Window.java
+++ b/src/newt/classes/com/jogamp/newt/intel/gdl/Window.java
@@ -31,11 +31,11 @@
  * 
  */
 
-package com.jogamp.javafx.newt.intel.gdl;
+package com.jogamp.newt.intel.gdl;
 
 import javax.media.nativewindow.*;
 
-public class Window extends com.jogamp.javafx.newt.Window {
+public class Window extends com.jogamp.newt.Window {
     static {
         Display.initSingleton();
     }
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java b/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
index 4d78358d7..2f86125f8 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java
@@ -31,13 +31,13 @@
  * 
  */
 
-package com.jogamp.javafx.newt.macosx;
+package com.jogamp.newt.macosx;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.macosx.*;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.javafx.newt.util.MainThread;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+import com.jogamp.newt.util.MainThread;
 
 public class MacDisplay extends Display {
     static {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java b/src/newt/classes/com/jogamp/newt/macosx/MacScreen.java
index 8d0be80dc..92f8e908c 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacScreen.java
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacScreen.java
@@ -31,9 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.macosx;
+package com.jogamp.newt.macosx;
 
-import com.jogamp.javafx.newt.*;
+import com.jogamp.newt.*;
 import javax.media.nativewindow.*;
 
 public class MacScreen extends Screen {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
index f1698bfcd..06e73caa5 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/macosx/MacWindow.java
+++ b/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java
@@ -31,13 +31,13 @@
  * 
  */
 
-package com.jogamp.javafx.newt.macosx;
+package com.jogamp.newt.macosx;
 
 import javax.media.nativewindow.*;
 
-import com.jogamp.javafx.newt.util.MainThread;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.util.MainThread;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
 
 public class MacWindow extends Window {
     
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index b299d011e..800e38105 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -31,9 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.opengl;
+package com.jogamp.newt.opengl;
 
-import com.jogamp.javafx.newt.*;
+import com.jogamp.newt.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.GLDrawableHelper;
@@ -145,7 +145,7 @@ public class GLWindow extends Window implements GLAutoDrawable {
      * Best performance has been achieved with one GLWindow per thread.<br> 
      *
      * Enabling local pump messages while using the EDT, 
-     * {@link com.jogamp.javafx.newt.NewtFactory#setUseEDT(boolean)},
+     * {@link com.jogamp.newt.NewtFactory#setUseEDT(boolean)},
      * will result in an exception.
      *
      * @deprecated EXPERIMENTAL, semantic is about to be removed after further verification.
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
index c0c1ee5fd..a375181ac 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Display.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java
@@ -31,14 +31,14 @@
  * 
  */
 
-package com.jogamp.javafx.newt.opengl.broadcom.egl;
+package com.jogamp.newt.opengl.broadcom.egl;
 
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.impl.*;
 import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
 
-public class Display extends com.jogamp.javafx.newt.Display {
+public class Display extends com.jogamp.newt.Display {
 
     static {
         NativeLibLoader.loadNEWT();
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java
index f7abe3836..b4f07599b 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Screen.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java
@@ -31,12 +31,11 @@
  * 
  */
 
-package com.jogamp.javafx.newt.opengl.broadcom.egl;
+package com.jogamp.newt.opengl.broadcom.egl;
 
-import com.jogamp.javafx.newt.impl.*;
 import javax.media.nativewindow.*;
 
-public class Screen extends com.jogamp.javafx.newt.Screen {
+public class Screen extends com.jogamp.newt.Screen {
 
     static {
         Display.initSingleton();
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java
index bd2d7930e..185dc97b9 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/broadcom/egl/Window.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java
@@ -31,16 +31,14 @@
  * 
  */
 
-package com.jogamp.javafx.newt.opengl.broadcom.egl;
+package com.jogamp.newt.opengl.broadcom.egl;
 
-import com.jogamp.javafx.newt.impl.*;
 import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
 import javax.media.nativewindow.NativeWindowException;
 
-public class Window extends com.jogamp.javafx.newt.Window {
+public class Window extends com.jogamp.newt.Window {
     static {
         Display.initSingleton();
     }
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
index 40a37115d..b09568237 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java
@@ -31,10 +31,10 @@
  * 
  */
 
-package com.jogamp.javafx.newt.opengl.kd;
+package com.jogamp.newt.opengl.kd;
 
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
 import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java b/src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java
index 4bc7f8257..cd53c8152 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDScreen.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java
@@ -31,9 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.opengl.kd;
+package com.jogamp.newt.opengl.kd;
 
-import com.jogamp.javafx.newt.*;
+import com.jogamp.newt.*;
 import javax.media.nativewindow.*;
 
 public class KDScreen extends Screen {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java
index d5be2207c..555f54599 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/opengl/kd/KDWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java
@@ -31,10 +31,10 @@
  * 
  */
 
-package com.jogamp.javafx.newt.opengl.kd;
+package com.jogamp.newt.opengl.kd;
 
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
 import com.jogamp.opengl.impl.egl.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.GLCapabilities;
diff --git a/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java b/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java
index db3f97ee6..675c6f322 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/util/EventDispatchThread.java
+++ b/src/newt/classes/com/jogamp/newt/util/EventDispatchThread.java
@@ -34,10 +34,10 @@
  * facility.
  */
 
-package com.jogamp.javafx.newt.util;
+package com.jogamp.newt.util;
 
-import com.jogamp.javafx.newt.Display;
-import com.jogamp.javafx.newt.impl.Debug;
+import com.jogamp.newt.Display;
+import com.jogamp.newt.impl.Debug;
 import java.util.*;
 
 public class EventDispatchThread {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java b/src/newt/classes/com/jogamp/newt/util/MainThread.java
index 9bf25098f..6cd4f8c69 100644
--- a/src/newt/classes/com/jogamp/javafx/newt/util/MainThread.java
+++ b/src/newt/classes/com/jogamp/newt/util/MainThread.java
@@ -34,7 +34,7 @@
  * facility.
  */
 
-package com.jogamp.javafx.newt.util;
+package com.jogamp.newt.util;
 
 import java.util.*;
 import java.lang.reflect.Method;
@@ -43,9 +43,9 @@ import java.security.*;
 
 import javax.media.nativewindow.*;
 
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import com.jogamp.javafx.newt.macosx.MacDisplay;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
+import com.jogamp.newt.macosx.MacDisplay;
 import com.jogamp.nativewindow.impl.NWReflection;
 
 /**
@@ -64,7 +64,7 @@ import com.jogamp.nativewindow.impl.NWReflection;
  *
  * To support your NEWT Window platform, 
  * you have to pass your <i>main thread</i> actions to {@link #invoke invoke(..)},
- * have a look at the {@link com.jogamp.javafx.newt.macosx.MacWindow MacWindow} implementation.<br>
+ * have a look at the {@link com.jogamp.newt.macosx.MacWindow MacWindow} implementation.<br>
  * <i>TODO</i>: Some hardcoded dependencies exist in this implementation, 
  * where you have to patch this code or factor it out. <P>
  * 
@@ -77,7 +77,7 @@ import com.jogamp.nativewindow.impl.NWReflection;
  *
  * Test case on Mac OS X (or any other platform):
  <PRE>
-    java -XstartOnFirstThread com.jogamp.javafx.newt.util.MainThread demos.es1.RedSquare -GL2 -GL2 -GL2 -GL2
+    java -XstartOnFirstThread com.jogamp.newt.util.MainThread demos.es1.RedSquare -GL2 -GL2 -GL2 -GL2
  </PRE>
  * Which starts 4 threads, each with a window and OpenGL rendering.<br>
  */
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java b/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
index f2e8d21ef..05cab1a0a 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java
@@ -31,12 +31,12 @@
  * 
  */
 
-package com.jogamp.javafx.newt.windows;
+package com.jogamp.newt.windows;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.windows.*;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
 
 public class WindowsDisplay extends Display {
 
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java b/src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java
index ab11f97dd..aea3cd439 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsScreen.java
+++ b/src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java
@@ -31,10 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.windows;
+package com.jogamp.newt.windows;
 
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.*;
 import javax.media.nativewindow.*;
 
 public class WindowsScreen extends Screen {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java b/src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java
index 7c8864190..4a468ae86 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/windows/WindowsWindow.java
+++ b/src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java
@@ -31,10 +31,10 @@
  * 
  */
 
-package com.jogamp.javafx.newt.windows;
+package com.jogamp.newt.windows;
 
 import javax.media.nativewindow.*;
-import com.jogamp.javafx.newt.*;
+import com.jogamp.newt.*;
 
 public class WindowsWindow extends Window {
 
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
index 96d55c082..b8eb80b39 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Display.java
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Display.java
@@ -31,12 +31,12 @@
  * 
  */
 
-package com.jogamp.javafx.newt.x11;
+package com.jogamp.newt.x11;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.impl.*;
 import com.jogamp.nativewindow.impl.x11.X11Util;
 
 public class X11Display extends Display {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java b/src/newt/classes/com/jogamp/newt/x11/X11Screen.java
index d90b1868d..e053d99c0 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Screen.java
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Screen.java
@@ -31,11 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.x11;
+package com.jogamp.newt.x11;
 
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
-import javax.media.nativewindow.*;
+import com.jogamp.newt.*;
 import javax.media.nativewindow.x11.*;
 
 public class X11Screen extends Screen {
diff --git a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java b/src/newt/classes/com/jogamp/newt/x11/X11Window.java
index 8387160c9..cc3aa58a2 100755
--- a/src/newt/classes/com/jogamp/javafx/newt/x11/X11Window.java
+++ b/src/newt/classes/com/jogamp/newt/x11/X11Window.java
@@ -31,10 +31,9 @@
  * 
  */
 
-package com.jogamp.javafx.newt.x11;
+package com.jogamp.newt.x11;
 
-import com.jogamp.javafx.newt.*;
-import com.jogamp.javafx.newt.impl.*;
+import com.jogamp.newt.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 
diff --git a/src/newt/native/BroadcomEGL.c b/src/newt/native/BroadcomEGL.c
index 8a9c5f948..9aac90abb 100755
--- a/src/newt/native/BroadcomEGL.c
+++ b/src/newt/native/BroadcomEGL.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "com_jogamp_javafx_newt_opengl_broadcom_egl_Window.h"
+#include "com_jogamp_newt_opengl_broadcom_egl_Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -72,7 +72,7 @@ static jmethodID windowCreatedID = NULL;
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Display_DispatchMessages
   (JNIEnv *env, jobject obj)
 {
     // FIXME: n/a
@@ -80,7 +80,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_D
     (void) obj;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_CreateDisplay
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Display_CreateDisplay
   (JNIEnv *env, jobject obj, jint width, jint height)
 {
     (void) env;
@@ -94,7 +94,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_
     return (jlong) (intptr_t) dpy;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_DestroyDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Display_DestroyDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     EGLDisplay dpy  = (EGLDisplay)(intptr_t)display;
@@ -111,7 +111,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Display_D
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     windowCreatedID = (*env)->GetMethodID(env, clazz, "windowCreated", "(III)V");
@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Windo
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_CreateWindow
   (JNIEnv *env, jobject obj, jlong display, jboolean chromaKey, jint width, jint height)
 {
     EGLDisplay dpy  = (EGLDisplay)(intptr_t)display;
@@ -167,7 +167,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_C
     return (jlong) (intptr_t) window;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_CloseWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_CloseWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
     EGLDisplay dpy  = (EGLDisplay) (intptr_t) display;
@@ -180,7 +180,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_Cl
     DBG_PRINT( "[CloseWindow] X\n");
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_broadcom_egl_Window_SwapWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_broadcom_egl_Window_SwapWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
     EGLDisplay dpy  = (EGLDisplay) (intptr_t) display;
diff --git a/src/newt/native/IntelGDL.c b/src/newt/native/IntelGDL.c
index 77f582885..7857b594f 100644
--- a/src/newt/native/IntelGDL.c
+++ b/src/newt/native/IntelGDL.c
@@ -37,9 +37,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "com_jogamp_javafx_newt_intel_gdl_Display.h"
-#include "com_jogamp_javafx_newt_intel_gdl_Screen.h"
-#include "com_jogamp_javafx_newt_intel_gdl_Window.h"
+#include "com_jogamp_newt_intel_gdl_Display.h"
+#include "com_jogamp_newt_intel_gdl_Screen.h"
+#include "com_jogamp_newt_intel_gdl_Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -123,7 +123,7 @@ static void JNI_ThrowNew(JNIEnv *env, const char *throwable, const char* message
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Display_DispatchMessages
   (JNIEnv *env, jobject obj, jlong displayHandle, jobject focusedWindow)
 {
     // FIXME: n/a
@@ -138,7 +138,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DispatchMes
     } */
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_CreateDisplay
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_intel_gdl_Display_CreateDisplay
   (JNIEnv *env, jobject obj)
 {
     gdl_ret_t retval;
@@ -171,7 +171,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_CreateDisp
     return (jlong) (intptr_t) p_driver_info;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DestroyDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Display_DestroyDisplay
   (JNIEnv *env, jobject obj, jlong displayHandle)
 {
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -190,7 +190,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Display_DestroyDisp
  * Screen
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_intel_gdl_Screen_initIDs
   (JNIEnv *env, jclass clazz)
 {
     screenCreatedID = (*env)->GetMethodID(env, clazz, "screenCreated", "(II)V");
@@ -202,7 +202,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_initIDs
     return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_GetScreenInfo
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Screen_GetScreenInfo
   (JNIEnv *env, jobject obj, jlong displayHandle, jint idx)
 {
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -234,7 +234,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Screen_GetScreenInf
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_intel_gdl_Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     updateBoundsID = (*env)->GetMethodID(env, clazz, "updateBounds", "(IIII)V");
@@ -246,7 +246,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_initIDs
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CreateSurface
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_intel_gdl_Window_CreateSurface
   (JNIEnv *env, jobject obj, jlong displayHandle, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) {
 
     gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle;
@@ -339,7 +339,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CreateSurfa
     return (jlong) (intptr_t) plane;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CloseSurface
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Window_CloseSurface
   (JNIEnv *env, jobject obj, jlong display, jlong surface)
 {
     gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ;
@@ -348,7 +348,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_CloseSurface
     DBG_PRINT("[CloseSurface] plane %d\n", plane);
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_intel_gdl_Window_SetBounds0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_intel_gdl_Window_SetBounds0
   (JNIEnv *env, jobject obj, jlong surface, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) {
 
     gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ;
diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c
index 31e8017f4..15bef7582 100755
--- a/src/newt/native/KDWindow.c
+++ b/src/newt/native/KDWindow.c
@@ -64,7 +64,7 @@
 #include <KD/kd.h>
 #include <KD/NV_extwindowprops.h>
 
-#include "com_jogamp_javafx_newt_opengl_kd_KDWindow.h"
+#include "com_jogamp_newt_opengl_kd_KDWindow.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -103,7 +103,7 @@ static jmethodID sendKeyEventID = NULL;
  * Display
  */
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDDisplay_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDDisplay_DispatchMessages
   (JNIEnv *env, jobject obj)
 {
     const KDEvent * evt;
@@ -200,7 +200,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDDisplay_DispatchM
  * Window
  */
 
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
 #ifdef VERBOSE_ON
@@ -228,7 +228,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_initID
     return JNI_TRUE;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_CreateWindow
   (JNIEnv *env, jobject obj, jlong display, jintArray jAttrs)
 {
     jint * attrs = NULL;
@@ -270,7 +270,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CreateWin
     return (jlong) (intptr_t) window;
 }
 
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_RealizeWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_RealizeWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -285,7 +285,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_RealizeWi
     return (jlong) (intptr_t) nativeWindow;
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CloseWindow
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_CloseWindow
   (JNIEnv *env, jobject obj, jlong window, jlong juserData)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -299,11 +299,11 @@ JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_CloseWindo
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_opengl_kd_KDWindow
+ * Class:     com_jogamp_newt_opengl_kd_KDWindow
  * Method:    setVisible0
  * Signature: (JJZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_setVisible0
   (JNIEnv *env, jobject obj, jlong window, jboolean visible)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -312,7 +312,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setVisible
     DBG_PRINT( "[setVisible] v=%d\n", visible);
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setFullScreen0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_setFullScreen0
   (JNIEnv *env, jobject obj, jlong window, jboolean fullscreen)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
@@ -323,7 +323,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setFullScr
     (void)res;
 }
 
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_opengl_kd_KDWindow_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_opengl_kd_KDWindow_setSize0
   (JNIEnv *env, jobject obj, jlong window, jint width, jint height)
 {
     KDWindow *w = (KDWindow*) (intptr_t) window;
diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m
index 1749805c8..01563a0d1 100644
--- a/src/newt/native/MacWindow.m
+++ b/src/newt/native/MacWindow.m
@@ -33,7 +33,7 @@
 
 #import <inttypes.h>
 
-#import "com_sun_javafx_newt_macosx_MacWindow.h"
+#import "com_sun_newt_macosx_MacWindow.h"
 #import "NewtMacWindow.h"
 
 #import "EventListener.h"
@@ -121,11 +121,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacDisplay
+ * Class:     com_sun_newt_macosx_MacDisplay
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacDisplay_initNSApplication
+JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacDisplay_initNSApplication
   (JNIEnv *env, jclass clazz)
 {
     static int initialized = 0;
@@ -155,11 +155,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacDisplay_initNSAppl
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacDisplay
+ * Class:     com_sun_newt_macosx_MacDisplay
  * Method:    dispatchMessages0
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacDisplay_dispatchMessages0
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacDisplay_dispatchMessages0
   (JNIEnv *env, jobject unused, jlong window, jint eventMask)
 {
     NSEvent* event = NULL;
@@ -195,11 +195,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacScreen
+ * Class:     com_sun_newt_macosx_MacScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getWidthImpl
+JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getWidthImpl
   (JNIEnv *env, jclass clazz, jint screen_idx)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -216,11 +216,11 @@ JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getWidthImpl
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacScreen
+ * Class:     com_sun_newt_macosx_MacScreen
  * Method:    getHeightImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getHeightImpl
+JNIEXPORT jint JNICALL Java_com_sun_newt_macosx_MacScreen_getHeightImpl
   (JNIEnv *env, jclass clazz, jint screen_idx)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -237,11 +237,11 @@ JNIEXPORT jint JNICALL Java_com_sun_javafx_newt_macosx_MacScreen_getHeightImpl
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_sun_newt_macosx_MacWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
     static int initialized = 0;
@@ -258,11 +258,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_initIDs
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    createWindow0
  * Signature: (JIIIIZIIIJ)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_createWindow0
+JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_createWindow0
   (JNIEnv *env, jobject jthis, jlong parent, jint x, jint y, jint w, jint h, jboolean fullscreen, jint styleMask, 
    jint bufferingType, jint screen_idx, jlong jview)
 {
@@ -334,11 +334,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    makeKeyAndOrderFront
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKeyAndOrderFront
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKeyAndOrderFront
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -348,11 +348,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKeyAndOrder
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    makeKey
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKey
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_makeKey
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -362,11 +362,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_makeKey
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    orderOut
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_orderOut
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_orderOut
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -376,11 +376,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_orderOut
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    close0
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_close0
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_close0
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -401,11 +401,11 @@ NS_ENDHANDLER
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    setTitle0
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setTitle0
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setTitle0
   (JNIEnv *env, jobject unused, jlong window, jstring title)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -417,11 +417,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setTitle0
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    contentView
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_contentView
+JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_contentView
   (JNIEnv *env, jobject unused, jlong window)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -432,11 +432,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_contentView
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    changeContentView
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_changeContentView
+JNIEXPORT jlong JNICALL Java_com_sun_newt_macosx_MacWindow_changeContentView
   (JNIEnv *env, jobject jthis, jlong parent, jlong window, jlong jview)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -452,11 +452,11 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_changeContentV
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    setContentSize
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setContentSize
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setContentSize
   (JNIEnv *env, jobject unused, jlong window, jint w, jint h)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -467,11 +467,11 @@ JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setContentSize
 }
 
 /*
- * Class:     com_sun_javafx_newt_macosx_MacWindow
+ * Class:     com_sun_newt_macosx_MacWindow
  * Method:    setFrameTopLeftPoint
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_sun_javafx_newt_macosx_MacWindow_setFrameTopLeftPoint
+JNIEXPORT void JNICALL Java_com_sun_newt_macosx_MacWindow_setFrameTopLeftPoint
   (JNIEnv *env, jobject unused, jlong parent, jlong window, jint x, jint y)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c
index d39b96d0b..67da99b1f 100755
--- a/src/newt/native/WindowsWindow.c
+++ b/src/newt/native/WindowsWindow.c
@@ -89,7 +89,7 @@
 #define MONITOR_DEFAULTTONEAREST 2
 #endif
 
-#include "com_jogamp_javafx_newt_windows_WindowsWindow.h"
+#include "com_jogamp_newt_windows_WindowsWindow.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -902,11 +902,11 @@ static LRESULT CALLBACK wndProc(HWND wnd, UINT message,
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    DispatchMessages
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_DispatchMessages
   (JNIEnv *env, jclass clazz)
 {
     int i = 0;
@@ -925,11 +925,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_Dispat
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    LoadLibraryW
  * Signature: (Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_LoadLibraryW
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_LoadLibraryW
   (JNIEnv *env, jclass clazz, jstring dllName)
 {
     jchar* _dllName = GetNullTerminatedStringChars(env, dllName);
@@ -939,11 +939,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_LoadL
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    RegisterWindowClass
  * Signature: (Ljava/lang/String;J)I
  */
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_RegisterWindowClass
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_RegisterWindowClass
   (JNIEnv *env, jclass clazz, jstring wndClassName, jlong hInstance)
 {
     ATOM res;
@@ -979,44 +979,44 @@ JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_Regist
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsDisplay
+ * Class:     com_jogamp_newt_windows_WindowsDisplay
  * Method:    CleanupWindowResources
  * Signature: (java/lang/String;J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsDisplay_UnregisterWindowClass
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsDisplay_UnregisterWindowClass
   (JNIEnv *env, jclass clazz, jint wndClassAtom, jlong hInstance)
 {
     UnregisterClass(MAKEINTATOM(wndClassAtom), (HINSTANCE) (intptr_t) hInstance);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsScreen
+ * Class:     com_jogamp_newt_windows_WindowsScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsScreen_getWidthImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_windows_WindowsScreen_getWidthImpl
   (JNIEnv *env, jobject obj, jint scrn_idx)
 {
     return (jint)GetSystemMetrics(SM_CXSCREEN);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsScreen
+ * Class:     com_jogamp_newt_windows_WindowsScreen
  * Method:    getWidthImpl
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_windows_WindowsScreen_getHeightImpl
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_windows_WindowsScreen_getHeightImpl
   (JNIEnv *env, jobject obj, jint scrn_idx)
 {
     return (jint)GetSystemMetrics(SM_CYSCREEN);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_windows_WindowsWindow_initIDs
   (JNIEnv *env, jclass clazz)
 {
     sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(II)V");
@@ -1045,11 +1045,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_ini
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    CreateWindow
  * Signature: (JILjava/lang/String;JJZIIII)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsWindow_CreateWindow
   (JNIEnv *env, jobject obj, jlong parent, jint wndClassAtom, jstring jWndName, jlong hInstance, jlong visualID,
         jboolean bIsUndecorated,
         jint jx, jint jy, jint defaultWidth, jint defaultHeight)
@@ -1113,44 +1113,44 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_Create
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    DestroyWindow
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_DestroyWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_DestroyWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     DestroyWindow((HWND) (intptr_t) window);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    GetDC
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_GetDC
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsWindow_GetDC
   (JNIEnv *env, jobject obj, jlong window)
 {
     return (jlong) (intptr_t) GetDC((HWND) (intptr_t) window);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    ReleaseDC
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_ReleaseDC
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_ReleaseDC
   (JNIEnv *env, jobject obj, jlong window, jlong dc)
 {
     ReleaseDC((HWND) (intptr_t) window, (HDC) (intptr_t) dc);
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    MonitorFromWindow
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_MonitorFromWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_windows_WindowsWindow_MonitorFromWindow
   (JNIEnv *env, jobject obj, jlong window)
 {
     #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410 || WINVER >= 0x0500) && !defined(_WIN32_WCE)
@@ -1161,11 +1161,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_Monito
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setVisible0
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setVisible0
   (JNIEnv *_env, jclass clazz, jlong window, jboolean visible)
 {
     HWND hWnd = (HWND) (intptr_t) window;
@@ -1178,11 +1178,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setVisi
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setSize0
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setSize0
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y, jint width, jint height)
 {
     HWND hwndP = (HWND) (intptr_t) parent;
@@ -1215,11 +1215,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setSize
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setPosition
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setPosition
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setPosition
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y)
 {
     UINT flags = SWP_NOACTIVATE | SWP_NOSIZE;
@@ -1236,11 +1236,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setPosi
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setFullscreen
  * Signature: (JIIIIZZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setFullscreen0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setFullscreen0
   (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y, jint width, jint height, jboolean bIsUndecorated, jboolean on)
 {
     UINT flags;
@@ -1272,11 +1272,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setFull
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    setTitle
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setTitle
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_setTitle
   (JNIEnv *env, jclass clazz, jlong window, jstring title)
 {
     HWND hwnd = (HWND) (intptr_t) window;
@@ -1290,11 +1290,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_setTitl
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_windows_WindowsWindow
+ * Class:     com_jogamp_newt_windows_WindowsWindow
  * Method:    requestFocus
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_windows_WindowsWindow_requestFocus
+JNIEXPORT void JNICALL Java_com_jogamp_newt_windows_WindowsWindow_requestFocus
   (JNIEnv *env, jclass clazz, jlong window)
 {
     HWND hwnd = (HWND) (intptr_t) window;
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 682184da0..11f7d0f6c 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -46,7 +46,7 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
-#include "com_jogamp_javafx_newt_x11_X11Window.h"
+#include "com_jogamp_newt_x11_X11Window.h"
 
 #include "EventListener.h"
 #include "MouseEvent.h"
@@ -154,7 +154,7 @@ static const char * const ClazzNameRuntimeException =
 static jclass    runtimeExceptionClz=NULL;
 
 static const char * const ClazzNameNewtWindow = 
-                            "com/jogamp/javafx/newt/Window";
+                            "com/jogamp/newt/Window";
 static jclass    newtWindowClz=NULL;
 
 static jmethodID windowChangedID = NULL;
@@ -187,11 +187,11 @@ static void _throwNewRuntimeException(Display * unlockDisplay, JNIEnv *env, cons
  */
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_x11_X11Display_initIDs
   (JNIEnv *env, jclass clazz)
 {
     jclass c;
@@ -237,11 +237,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_initIDs
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    LockDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_LockDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_LockDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -253,11 +253,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_LockDisplay
 
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    UnlockDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_UnlockDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_UnlockDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -269,11 +269,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_UnlockDisplay
 
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    CompleteDisplay
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_CompleteDisplay
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_CompleteDisplay
   (JNIEnv *env, jobject obj, jlong display)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -381,11 +381,11 @@ static jobject getJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, j
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Display
+ * Class:     com_jogamp_newt_x11_X11Display
  * Method:    DispatchMessages
  * Signature: (JIJJ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_DispatchMessages
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Display_DispatchMessages
   (JNIEnv *env, jobject obj, jlong display, jlong javaObjectAtom, jlong wmDeleteAtom)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -532,11 +532,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Display_DispatchMessag
  */
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Screen
+ * Class:     com_jogamp_newt_x11_X11Screen
  * Method:    GetScreen
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_GetScreen
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Screen_GetScreen
   (JNIEnv *env, jobject obj, jlong display, jint screen_index)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -559,14 +559,14 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_GetScreen
     return (jlong) (intptr_t) scrn;
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getWidth0
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_x11_X11Screen_getWidth0
   (JNIEnv *env, jobject obj, jlong display, jint scrn_idx)
 {
     Display * dpy = (Display *) (intptr_t) display;
     return (jint) XDisplayWidth( dpy, scrn_idx);
 }
 
-JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getHeight0
+JNIEXPORT jint JNICALL Java_com_jogamp_newt_x11_X11Screen_getHeight0
   (JNIEnv *env, jobject obj, jlong display, jint scrn_idx)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -579,11 +579,11 @@ JNIEXPORT jint JNICALL Java_com_jogamp_javafx_newt_x11_X11Screen_getHeight0
  */
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    initIDs
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_initIDs
+JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_x11_X11Window_initIDs
   (JNIEnv *env, jclass clazz)
 {
     windowChangedID = (*env)->GetMethodID(env, clazz, "windowChanged", "(IIII)V");
@@ -605,11 +605,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_initIDs
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    CreateWindow
  * Signature: (JJIJIIII)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CreateWindow
+JNIEXPORT jlong JNICALL Java_com_jogamp_newt_x11_X11Window_CreateWindow
   (JNIEnv *env, jobject obj, jlong parent, jlong display, jint screen_index, 
                              jlong visualID, 
                              jlong javaObjectAtom, jlong windowDeleteAtom, 
@@ -734,11 +734,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CreateWindow
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    CloseWindow
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CloseWindow
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_CloseWindow
   (JNIEnv *env, jobject obj, jlong display, jlong window, jlong javaObjectAtom)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -779,11 +779,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_CloseWindow
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    setVisible0
  * Signature: (JJZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setVisible0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setVisible0
   (JNIEnv *env, jobject obj, jlong display, jlong window, jboolean visible)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -823,11 +823,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setVisible0
 #endif
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    setSize0
  * Signature: (JIJIIIIIZ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setSize0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setSize0
   (JNIEnv *env, jobject obj, jlong jparent, jlong display, jint screen_index, jlong window, jint x, jint y, jint width, jint height, jint decorationToggle, jboolean setVisible)
 {
     Display * dpy = (Display *) (intptr_t) display;
@@ -887,11 +887,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setSize0
 }
 
 /*
- * Class:     com_jogamp_javafx_newt_x11_X11Window
+ * Class:     com_jogamp_newt_x11_X11Window
  * Method:    setPosition0
  * Signature: (JJII)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_javafx_newt_x11_X11Window_setPosition0
+JNIEXPORT void JNICALL Java_com_jogamp_newt_x11_X11Window_setPosition0
   (JNIEnv *env, jobject obj, jlong display, jlong window, jint x, jint y)
 {
     Display * dpy = (Display *) (intptr_t) display;