28 files changed, 49 insertions, 43 deletions
diff --git a/src/newt/classes/jogamp/newt/DisplayImpl.java b/src/newt/classes/jogamp/newt/DisplayImpl.java
index d18d1e912..d98e55bd8 100644
--- a/src/newt/classes/jogamp/newt/DisplayImpl.java
+++ b/src/newt/classes/jogamp/newt/DisplayImpl.java
@@ -56,16 +56,18 @@ public abstract class DisplayImpl extends Display {
     {
         Class displayClass = NewtFactory.getCustomClass(type, "Display");
         if(null==displayClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                displayClass = Class.forName("jogamp.newt.egl.kd.KDDisplay");
+            if (NativeWindowFactory.TYPE_ANDROID.equals(type)) {
+                displayClass = Class.forName("jogamp.newt.driver.android.Display");
+            } else if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                displayClass = Class.forName("jogamp.newt.driver.kd.KDDisplay");
             } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                displayClass = Class.forName("jogamp.newt.windows.WindowsDisplay");
+                displayClass = Class.forName("jogamp.newt.driver.windows.WindowsDisplay");
             } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                displayClass = Class.forName("jogamp.newt.macosx.MacDisplay");
+                displayClass = Class.forName("jogamp.newt.driver.macosx.MacDisplay");
             } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                displayClass = Class.forName("jogamp.newt.x11.X11Display");
+                displayClass = Class.forName("jogamp.newt.driver.x11.X11Display");
             } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                displayClass = Class.forName("jogamp.newt.awt.AWTDisplay");
+                displayClass = Class.forName("jogamp.newt.driver.awt.AWTDisplay");
             } else {
                 throw new RuntimeException("Unknown display type \"" + type + "\"");
             }
diff --git a/src/newt/classes/jogamp/newt/ScreenImpl.java b/src/newt/classes/jogamp/newt/ScreenImpl.java
index 54f7aa411..d1ed10aaf 100644
--- a/src/newt/classes/jogamp/newt/ScreenImpl.java
+++ b/src/newt/classes/jogamp/newt/ScreenImpl.java
@@ -69,16 +69,18 @@ public abstract class ScreenImpl extends Screen implements ScreenModeListener {
     {
         Class screenClass = NewtFactory.getCustomClass(type, "Screen");
         if(null==screenClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                screenClass = Class.forName("jogamp.newt.egl.kd.KDScreen");
+            if (NativeWindowFactory.TYPE_ANDROID.equals(type)) {
+                screenClass = Class.forName("jogamp.newt.driver.android.Screen");
+            } else if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                screenClass = Class.forName("jogamp.newt.driver.kd.KDScreen");
             } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                screenClass = Class.forName("jogamp.newt.windows.WindowsScreen");
+                screenClass = Class.forName("jogamp.newt.driver.windows.WindowsScreen");
             } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                screenClass = Class.forName("jogamp.newt.macosx.MacScreen");
+                screenClass = Class.forName("jogamp.newt.driver.macosx.MacScreen");
             } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                screenClass = Class.forName("jogamp.newt.x11.X11Screen");
+                screenClass = Class.forName("jogamp.newt.driver.x11.X11Screen");
             } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                screenClass = Class.forName("jogamp.newt.awt.AWTScreen");
+                screenClass = Class.forName("jogamp.newt.driver.awt.AWTScreen");
             } else {
                 throw new RuntimeException("Unknown window type \"" + type + "\"");
             }
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index f98315f53..71d36e905 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -140,16 +140,18 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
     {
         Class windowClass = NewtFactory.getCustomClass(type, "Window");
         if(null==windowClass) {
-            if (NativeWindowFactory.TYPE_EGL.equals(type)) {
-                windowClass = Class.forName("jogamp.newt.egl.kd.KDWindow");
+            if (NativeWindowFactory.TYPE_ANDROID.equals(type)) {
+                windowClass = Class.forName("jogamp.newt.driver.android.Window");
+            } else if (NativeWindowFactory.TYPE_EGL.equals(type)) {
+                windowClass = Class.forName("jogamp.newt.driver.kd.KDWindow");
             } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) {
-                windowClass = Class.forName("jogamp.newt.windows.WindowsWindow");
+                windowClass = Class.forName("jogamp.newt.driver.windows.WindowsWindow");
             } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) {
-                windowClass = Class.forName("jogamp.newt.macosx.MacWindow");
+                windowClass = Class.forName("jogamp.newt.driver.macosx.MacWindow");
             } else if (NativeWindowFactory.TYPE_X11.equals(type)) {
-                windowClass = Class.forName("jogamp.newt.x11.X11Window");
+                windowClass = Class.forName("jogamp.newt.driver.x11.X11Window");
             } else if (NativeWindowFactory.TYPE_AWT.equals(type)) {
-                windowClass = Class.forName("jogamp.newt.awt.AWTWindow");
+                windowClass = Class.forName("jogamp.newt.driver.awt.AWTWindow");
             } else {
                 throw new NativeWindowException("Unknown window type \"" + type + "\"");
             }
diff --git a/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java b/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java
index c8e3f204f..6f3417164 100644
--- a/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java
+++ b/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
  
-package jogamp.newt.egl.android.event;
+package jogamp.newt.driver.android.event;
 
 import com.jogamp.common.util.IntIntHashMap;
 
diff --git a/src/newt/classes/jogamp/newt/awt/AWTCanvas.java b/src/newt/classes/jogamp/newt/driver/awt/AWTCanvas.java
index 01e813449..0729f02ab 100644
--- a/src/newt/classes/jogamp/newt/awt/AWTCanvas.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/AWTCanvas.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.awt;
+package jogamp.newt.driver.awt;
 
 import java.awt.Canvas;
 import java.awt.GraphicsDevice;
diff --git a/src/newt/classes/jogamp/newt/awt/AWTDisplay.java b/src/newt/classes/jogamp/newt/driver/awt/AWTDisplay.java
index 4c864c111..64c741464 100644
--- a/src/newt/classes/jogamp/newt/awt/AWTDisplay.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/AWTDisplay.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.awt;
+package jogamp.newt.driver.awt;
 
 import javax.media.nativewindow.AbstractGraphicsDevice;
 import javax.media.nativewindow.awt.AWTGraphicsDevice;
diff --git a/src/newt/classes/jogamp/newt/awt/AWTEDTUtil.java b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
index 7b638af31..0737e3281 100644
--- a/src/newt/classes/jogamp/newt/awt/AWTEDTUtil.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package jogamp.newt.awt;
+package jogamp.newt.driver.awt;
 
 import java.awt.EventQueue;
 import javax.media.nativewindow.NativeWindowException;
diff --git a/src/newt/classes/jogamp/newt/awt/AWTScreen.java b/src/newt/classes/jogamp/newt/driver/awt/AWTScreen.java
index d05933321..644c96391 100644
--- a/src/newt/classes/jogamp/newt/awt/AWTScreen.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/AWTScreen.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.awt;
+package jogamp.newt.driver.awt;
 
 import java.awt.DisplayMode;
 
diff --git a/src/newt/classes/jogamp/newt/awt/AWTWindow.java b/src/newt/classes/jogamp/newt/driver/awt/AWTWindow.java
index b07a9e313..1a86b891d 100644
--- a/src/newt/classes/jogamp/newt/awt/AWTWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/AWTWindow.java
@@ -32,7 +32,7 @@
  * 
  */
 
-package jogamp.newt.awt;
+package jogamp.newt.driver.awt;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
diff --git a/src/newt/classes/jogamp/newt/awt/opengl/VersionApplet.java b/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
index 18524d0ba..1cff76872 100644
--- a/src/newt/classes/jogamp/newt/awt/opengl/VersionApplet.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
@@ -1,4 +1,4 @@
-package jogamp.newt.awt.opengl;
+package jogamp.newt.driver.awt.opengl;
 
 import java.applet.Applet;
 import java.awt.BorderLayout;
diff --git a/src/newt/classes/jogamp/newt/egl/broadcom/Display.java b/src/newt/classes/jogamp/newt/driver/broadcom/egl/Display.java
index 9a97fe6a2..1ed91c1ac 100644
--- a/src/newt/classes/jogamp/newt/egl/broadcom/Display.java
+++ b/src/newt/classes/jogamp/newt/driver/broadcom/egl/Display.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.egl.broadcom;
+package jogamp.newt.driver.broadcom.egl;
 
 import jogamp.newt.*;
 import jogamp.opengl.egl.*;
diff --git a/src/newt/classes/jogamp/newt/egl/broadcom/Screen.java b/src/newt/classes/jogamp/newt/driver/broadcom/egl/Screen.java
index 9a6b6ed1e..0a8453701 100644
--- a/src/newt/classes/jogamp/newt/egl/broadcom/Screen.java
+++ b/src/newt/classes/jogamp/newt/driver/broadcom/egl/Screen.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.egl.broadcom;
+package jogamp.newt.driver.broadcom.egl;
 
 import javax.media.nativewindow.*;
 
diff --git a/src/newt/classes/jogamp/newt/egl/broadcom/Window.java b/src/newt/classes/jogamp/newt/driver/broadcom/egl/Window.java
index 79e8b371e..5bb567067 100644
--- a/src/newt/classes/jogamp/newt/egl/broadcom/Window.java
+++ b/src/newt/classes/jogamp/newt/driver/broadcom/egl/Window.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.egl.broadcom;
+package jogamp.newt.driver.broadcom.egl;
 
 import jogamp.opengl.egl.*;
 import javax.media.nativewindow.*;
diff --git a/src/newt/classes/jogamp/newt/intel/gdl/Display.java b/src/newt/classes/jogamp/newt/driver/intel/gdl/Display.java
index b1afdb55e..20e151eb3 100644
--- a/src/newt/classes/jogamp/newt/intel/gdl/Display.java
+++ b/src/newt/classes/jogamp/newt/driver/intel/gdl/Display.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.intel.gdl;
+package jogamp.newt.driver.intel.gdl;
 
 import jogamp.newt.*;
 import javax.media.nativewindow.*;
diff --git a/src/newt/classes/jogamp/newt/intel/gdl/Screen.java b/src/newt/classes/jogamp/newt/driver/intel/gdl/Screen.java
index b351fe6a9..26b7120a9 100644
--- a/src/newt/classes/jogamp/newt/intel/gdl/Screen.java
+++ b/src/newt/classes/jogamp/newt/driver/intel/gdl/Screen.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.intel.gdl;
+package jogamp.newt.driver.intel.gdl;
 
 import jogamp.newt.*;
 import javax.media.nativewindow.*;
diff --git a/src/newt/classes/jogamp/newt/intel/gdl/Window.java b/src/newt/classes/jogamp/newt/driver/intel/gdl/Window.java
index d6003beae..0e9a17b09 100644
--- a/src/newt/classes/jogamp/newt/intel/gdl/Window.java
+++ b/src/newt/classes/jogamp/newt/driver/intel/gdl/Window.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.intel.gdl;
+package jogamp.newt.driver.intel.gdl;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.util.Point;
diff --git a/src/newt/classes/jogamp/newt/egl/kd/KDDisplay.java b/src/newt/classes/jogamp/newt/driver/kd/KDDisplay.java
index d7e7cb87a..bbfe10160 100644
--- a/src/newt/classes/jogamp/newt/egl/kd/KDDisplay.java
+++ b/src/newt/classes/jogamp/newt/driver/kd/KDDisplay.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.egl.kd;
+package jogamp.newt.driver.kd;
 
 import com.jogamp.newt.*;
 import jogamp.newt.*;
diff --git a/src/newt/classes/jogamp/newt/egl/kd/KDScreen.java b/src/newt/classes/jogamp/newt/driver/kd/KDScreen.java
index 132e10b9e..fff496102 100644
--- a/src/newt/classes/jogamp/newt/egl/kd/KDScreen.java
+++ b/src/newt/classes/jogamp/newt/driver/kd/KDScreen.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.egl.kd;
+package jogamp.newt.driver.kd;
 
 import com.jogamp.newt.*;
 import jogamp.newt.ScreenImpl;
diff --git a/src/newt/classes/jogamp/newt/egl/kd/KDWindow.java b/src/newt/classes/jogamp/newt/driver/kd/KDWindow.java
index cde946bb2..2befaa9aa 100644
--- a/src/newt/classes/jogamp/newt/egl/kd/KDWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/kd/KDWindow.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.egl.kd;
+package jogamp.newt.driver.kd;
 
 import jogamp.newt.*;
 import jogamp.opengl.egl.*;
diff --git a/src/newt/classes/jogamp/newt/macosx/MacDisplay.java b/src/newt/classes/jogamp/newt/driver/macosx/MacDisplay.java
index 49f2ff5d8..db8577562 100644
--- a/src/newt/classes/jogamp/newt/macosx/MacDisplay.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/MacDisplay.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.macosx;
+package jogamp.newt.driver.macosx;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.macosx.*;
diff --git a/src/newt/classes/jogamp/newt/macosx/MacScreen.java b/src/newt/classes/jogamp/newt/driver/macosx/MacScreen.java
index 30028602c..67a3f8e92 100644
--- a/src/newt/classes/jogamp/newt/macosx/MacScreen.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/MacScreen.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.macosx;
+package jogamp.newt.driver.macosx;
 
 import com.jogamp.newt.*;
 import jogamp.newt.ScreenImpl;
diff --git a/src/newt/classes/jogamp/newt/macosx/MacWindow.java b/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
index a27f04797..19a374511 100644
--- a/src/newt/classes/jogamp/newt/macosx/MacWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
@@ -32,7 +32,7 @@
  * 
  */
 
-package jogamp.newt.macosx;
+package jogamp.newt.driver.macosx;
 
 import javax.media.nativewindow.*;
 import com.jogamp.common.util.locks.RecursiveLock;
diff --git a/src/newt/classes/jogamp/newt/windows/WindowsDisplay.java b/src/newt/classes/jogamp/newt/driver/windows/WindowsDisplay.java
index 750c38092..524d9fc57 100644
--- a/src/newt/classes/jogamp/newt/windows/WindowsDisplay.java
+++ b/src/newt/classes/jogamp/newt/driver/windows/WindowsDisplay.java
@@ -32,7 +32,7 @@
  * 
  */
 
-package jogamp.newt.windows;
+package jogamp.newt.driver.windows;
 
 import jogamp.nativewindow.windows.RegisteredClass;
 import jogamp.nativewindow.windows.RegisteredClassFactory;
diff --git a/src/newt/classes/jogamp/newt/windows/WindowsScreen.java b/src/newt/classes/jogamp/newt/driver/windows/WindowsScreen.java
index ea7fe8d55..f2e457a0f 100644
--- a/src/newt/classes/jogamp/newt/windows/WindowsScreen.java
+++ b/src/newt/classes/jogamp/newt/driver/windows/WindowsScreen.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  * 
  */
-package jogamp.newt.windows;
+package jogamp.newt.driver.windows;
 
 import com.jogamp.common.util.ArrayHashSet;
 import java.util.ArrayList;
diff --git a/src/newt/classes/jogamp/newt/windows/WindowsWindow.java b/src/newt/classes/jogamp/newt/driver/windows/WindowsWindow.java
index 653de295d..75b4e7d90 100644
--- a/src/newt/classes/jogamp/newt/windows/WindowsWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/windows/WindowsWindow.java
@@ -32,7 +32,7 @@
  * 
  */
 
-package jogamp.newt.windows;
+package jogamp.newt.driver.windows;
 
 import jogamp.nativewindow.windows.GDI;
 import jogamp.newt.WindowImpl;
diff --git a/src/newt/classes/jogamp/newt/x11/X11Display.java b/src/newt/classes/jogamp/newt/driver/x11/X11Display.java
index 0804455d1..483556f82 100644
--- a/src/newt/classes/jogamp/newt/x11/X11Display.java
+++ b/src/newt/classes/jogamp/newt/driver/x11/X11Display.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.x11;
+package jogamp.newt.driver.x11;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
diff --git a/src/newt/classes/jogamp/newt/x11/X11Screen.java b/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java
index 4788f6b52..63fa46c9c 100644
--- a/src/newt/classes/jogamp/newt/x11/X11Screen.java
+++ b/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  * 
  */
-package jogamp.newt.x11;
+package jogamp.newt.driver.x11;
 
 import jogamp.nativewindow.x11.X11Util;
 import jogamp.newt.ScreenImpl;
diff --git a/src/newt/classes/jogamp/newt/x11/X11Window.java b/src/newt/classes/jogamp/newt/driver/x11/X11Window.java
index 9934d4b7a..19a0c7626 100644
--- a/src/newt/classes/jogamp/newt/x11/X11Window.java
+++ b/src/newt/classes/jogamp/newt/driver/x11/X11Window.java
@@ -31,7 +31,7 @@
  * 
  */
 
-package jogamp.newt.x11;
+package jogamp.newt.driver.x11;
 
 import jogamp.nativewindow.x11.X11Util;
 import jogamp.newt.WindowImpl;