Merge branch 'master' of github.com:mbien/jogl

44 files changed, 145 insertions, 152 deletions

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.*;