246 files changed, 554 insertions, 3111 deletions

diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
index 7acba95e6..d11504a64 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
@@ -550,7 +550,7 @@ public class BuildComposablePipeline {
          * method wrappers have been generated.
          */
         protected void preMethodEmissionHook(PrintWriter output) {
-            output.println("  public static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug(\"" + getOutputName() + "\");");
+            output.println("  public static final boolean DEBUG = jogamp.opengl.Debug.debug(\"" + getOutputName() + "\");");
         }
 
         /**
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp
deleted file mode 100644
index f686bea92..000000000
--- a/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jogamp.opengl.impl;
-
-public class SystemUtil {
-
-    /** Wrapper for System.getenv(), which doesn't work on platforms
-        earlier than JDK 5 */
-    public static String getenv(String variableName) {
-        return null;
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
index 96cfe6562..4a8579767 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
@@ -29,7 +29,7 @@
 package com.jogamp.opengl.util;
 
 import com.jogamp.common.util.locks.RecursiveLock;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import java.util.ArrayList;
 import javax.media.opengl.GLAnimatorControl;
 import javax.media.opengl.GLAutoDrawable;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
index 1141f6624..4586d1df5 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
@@ -8,7 +8,7 @@ import javax.media.opengl.*;
 
 import com.jogamp.opengl.util.glsl.*;
 
-import com.jogamp.opengl.impl.SystemUtil;
+import jogamp.opengl.SystemUtil;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
index 2ab77fa1b..88a8603f9 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
@@ -3,7 +3,7 @@ package com.jogamp.opengl.util;
 
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
+import jogamp.opengl.util.glsl.fixedfunc.*;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Gamma.java b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
index 672325cf3..c649d1c6a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
@@ -40,7 +40,7 @@
 package com.jogamp.opengl.util;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 /** Provides control over the primary display's gamma, brightness and
     contrast controls via the hardware gamma ramp tables. Not
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index 47de8ce0a..0e1b7926e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -34,7 +34,7 @@
 package com.jogamp.opengl.util;
 
 import com.jogamp.common.nio.Buffers;
-import com.jogamp.opengl.impl.ProjectFloat;
+import jogamp.opengl.ProjectFloat;
 
 import java.nio.*;
 import java.util.ArrayList;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
index 6073a75f8..86882176a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
@@ -40,7 +40,7 @@
 package com.jogamp.opengl.util.awt;
 
 import com.jogamp.common.nio.Buffers;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.packrect.*;
 import com.jogamp.opengl.util.texture.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
index 1d7f38afe..5dd1b5a3a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -31,7 +31,7 @@ package com.jogamp.opengl.util.glsl;
 import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 
 import java.util.*;
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
index 42bf91e65..57ae6cfda 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -29,7 +29,7 @@
 package com.jogamp.opengl.util.glsl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
index 7ec4ac50e..9d7eecb60 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
@@ -7,7 +7,7 @@ package com.jogamp.opengl.util.glsl.fixedfunc;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 
-import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
+import jogamp.opengl.util.glsl.fixedfunc.*;
 
 /**
  * Tool to pipeline GL2ES2 into a fixed function emulation implementing GL2ES1.
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
index 57ac0d45a..38f8ff974 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -42,7 +42,7 @@ import java.security.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.NativeWindowFactory;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.opengl.util.texture.*;
 import com.jogamp.opengl.util.texture.spi.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java
index 819a6acf5..e86ff161b 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java
@@ -46,7 +46,7 @@ import java.util.*;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.texture.spi.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
deleted file mode 100644
index 3b694be68..000000000
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
+++ /dev/null
@@ -1,1256 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.opengl.util.texture;
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.util.*;
-
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import com.jogamp.opengl.impl.Debug;
-import com.jogamp.opengl.util.*;
-import com.jogamp.opengl.util.texture.spi.*;
-
-/** <P> Provides input and output facilities for both loading OpenGL
-    textures from disk and streams as well as writing textures already
-    in memory back to disk. </P>
-
-    <P> The TextureIO class supports an arbitrary number of plug-in
-    readers and writers via TextureProviders and TextureWriters.
-    TextureProviders know how to produce TextureData objects from
-    files, InputStreams and URLs. TextureWriters know how to write
-    TextureData objects to disk in various file formats. The
-    TextureData class represents the raw data of the texture before it
-    has been converted to an OpenGL texture object. The Texture class
-    represents the OpenGL texture object and provides easy facilities
-    for using the texture. </P>
-
-    <P> There are several built-in TextureProviders and TextureWriters
-    supplied with the TextureIO implementation. The most basic
-    provider uses the platform's Image I/O facilities to read in a
-    BufferedImage and convert it to a texture. This is the baseline
-    provider and is registered so that it is the last one consulted.
-    All others are asked first to open a given file. </P>
-
-    <P> There are three other providers registered by default as of
-    the time of this writing. One handles SGI RGB (".sgi", ".rgb")
-    images from both files and streams. One handles DirectDraw Surface
-    (".dds") images read from files, though can not read these images
-    from streams. One handles Targa (".tga") images read from both
-    files and streams. These providers are executed in an arbitrary
-    order. Some of these providers require the file's suffix to either
-    be specified via the newTextureData methods or for the file to be
-    named with the appropriate suffix. In general a file suffix should
-    be provided to the newTexture and newTextureData methods if at all
-    possible. </P>
-
-    <P> Note that additional TextureProviders, if reading images from
-    InputStreams, must use the mark()/reset() methods on InputStream
-    when probing for e.g. magic numbers at the head of the file to
-    make sure not to disturb the state of the InputStream for
-    downstream TextureProviders. </P>
-
-    <P> There are analogous TextureWriters provided for writing
-    textures back to disk if desired. As of this writing, there are
-    four TextureWriters registered by default: one for Targa files,
-    one for SGI RGB files, one for DirectDraw surface (.dds) files,
-    and one for ImageIO-supplied formats such as .jpg and .png.  Some
-    of these writers have certain limitations such as only being able
-    to write out textures stored in GL_RGB or GL_RGBA format. The DDS
-    writer supports fetching and writing to disk of texture data in
-    DXTn compressed format. Whether this will occur is dependent on
-    whether the texture's internal format is one of the DXTn
-    compressed formats and whether the target file is .dds format.
-*/
-
-public class TextureIO {
-    /** Constant which can be used as a file suffix to indicate a
-        DirectDraw Surface file. */
-    public static final String DDS     = "dds";
-
-    /** Constant which can be used as a file suffix to indicate an SGI
-        RGB file. */
-    public static final String SGI     = "sgi";
-
-    /** Constant which can be used as a file suffix to indicate an SGI
-        RGB file. */
-    public static final String SGI_RGB = "rgb";
-
-    /** Constant which can be used as a file suffix to indicate a GIF
-        file. */
-    public static final String GIF     = "gif";
-
-    /** Constant which can be used as a file suffix to indicate a JPEG
-        file. */
-    public static final String JPG     = "jpg";
-
-    /** Constant which can be used as a file suffix to indicate a PNG
-        file. */
-    public static final String PNG     = "png";
-
-    /** Constant which can be used as a file suffix to indicate a Targa
-        file. */
-    public static final String TGA     = "tga";
-
-    /** Constant which can be used as a file suffix to indicate a TIFF
-        file. */
-    public static final String TIFF    = "tiff";
-
-    private static final boolean DEBUG = Debug.debug("TextureIO");
-
-    // For manually disabling the use of the texture rectangle
-    // extensions so you know the texture target is GL_TEXTURE_2D; this
-    // is useful for shader writers (thanks to Chris Campbell for this
-    // observation)
-    private static boolean texRectEnabled = true;
-
-    //----------------------------------------------------------------------
-    // methods that *do not* require a current context
-    // These methods assume RGB or RGBA textures.
-    // Some texture providers may not recognize the file format unless
-    // the fileSuffix is specified, so it is strongly recommended to
-    // specify it wherever it is known.
-    // Some texture providers may also only support one kind of input,
-    // i.e., reading from a file as opposed to a stream.
-
-    /**
-     * Creates a TextureData from the given file. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param file the file from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the file, or null if none of the
-     *         registered texture providers could read the file
-     * @throws IOException if an error occurred while reading the file
-     */
-    public static TextureData newTextureData(GLProfile glp, File file,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(file);
-        }
-        return newTextureDataImpl(glp, file, 0, 0, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given stream. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param stream the stream from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the stream, or null if none of the
-     *         registered texture providers could read the stream
-     * @throws IOException if an error occurred while reading the stream
-     */
-    public static TextureData newTextureData(GLProfile glp, InputStream stream,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        return newTextureDataImpl(glp, stream, 0, 0, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given URL. Does no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param url the URL from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the URL, or null if none of the
-     *         registered texture providers could read the URL
-     * @throws IOException if an error occurred while reading the URL
-     */
-    public static TextureData newTextureData(GLProfile glp, URL url,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-        return newTextureDataImpl(glp, url, 0, 0, mipmap, fileSuffix);
-    }
-
-    //----------------------------------------------------------------------
-    // These methods make no assumption about the OpenGL internal format
-    // or pixel format of the texture; they must be specified by the
-    // user. It is not allowed to supply 0 (indicating no preference)
-    // for either the internalFormat or the pixelFormat;
-    // IllegalArgumentException will be thrown in this case.
-
-    /**
-     * Creates a TextureData from the given file, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param file the file from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the file, or null if none of the
-     *         registered texture providers could read the file
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the file
-     */
-    public static TextureData newTextureData(GLProfile glp, File file,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(file);
-        }
-
-        return newTextureDataImpl(glp, file, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given stream, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param stream the stream from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the stream, or null if none of the
-     *         registered texture providers could read the stream
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the stream
-     */
-    public static TextureData newTextureData(GLProfile glp, InputStream stream,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        return newTextureDataImpl(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    /**
-     * Creates a TextureData from the given URL, using the specified
-     * OpenGL internal format and pixel format for the texture which
-     * will eventually result. The internalFormat and pixelFormat must
-     * be specified and may not be zero; to use default values, use the
-     * variant of this method which does not take these arguments. Does
-     * no OpenGL work.
-     *
-     * @param glp the OpenGL Profile this texture data should be
-     *                  created for.
-     * @param url the URL from which to read the texture data
-     * @param internalFormat the OpenGL internal format of the texture
-     *                   which will eventually result from the TextureData
-     * @param pixelFormat the OpenGL pixel format of the texture
-     *                    which will eventually result from the TextureData
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @return the texture data from the URL, or null if none of the
-     *         registered texture providers could read the URL
-     * @throws IllegalArgumentException if either internalFormat or
-     *                                  pixelFormat was 0
-     * @throws IOException if an error occurred while reading the URL
-     */
-    public static TextureData newTextureData(GLProfile glp, URL url,
-                                             int internalFormat,
-                                             int pixelFormat,
-                                             boolean mipmap,
-                                             String fileSuffix) throws IOException, IllegalArgumentException {
-        if ((internalFormat == 0) || (pixelFormat == 0)) {
-            throw new IllegalArgumentException("internalFormat and pixelFormat must be non-zero");
-        }
-
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-
-        return newTextureDataImpl(glp, url, internalFormat, pixelFormat, mipmap, fileSuffix);
-    }
-
-    //----------------------------------------------------------------------
-    // methods that *do* require a current context
-    //
-
-    /** 
-     * Creates an OpenGL texture object from the specified TextureData
-     * using the current OpenGL context.
-     *
-     * @param data the texture data to turn into an OpenGL texture
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     * @throws IllegalArgumentException if the passed TextureData was null
-     */
-    public static Texture newTexture(TextureData data) throws GLException, IllegalArgumentException {
-        if (data == null) {
-            throw new IllegalArgumentException("Null TextureData");
-        }
-        return new Texture(data);
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified file using
-     * the current OpenGL context.
-     *
-     * @param file the file from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @throws IOException if an error occurred while reading the file
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(File file, boolean mipmap) throws IOException, GLException {
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, file, mipmap, FileUtil.getFileSuffix(file));
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified stream using
-     * the current OpenGL context.
-     *
-     * @param stream the stream from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @throws IOException if an error occurred while reading the stream
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(InputStream stream, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, stream, mipmap, fileSuffix);
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object from the specified URL using the
-     * current OpenGL context.
-     *
-     * @param url the URL from which to read the texture data
-     * @param mipmap     whether mipmaps should be produced for this
-     *                   texture either by autogenerating them or
-     *                   reading them from the file. Some file formats
-     *                   support multiple mipmaps in a single file in
-     *                   which case those mipmaps will be used rather
-     *                   than generating them.
-     * @param fileSuffix the suffix of the file name to be used as a
-     *                   hint of the file format to the underlying
-     *                   texture provider, or null if none and should be
-     *                   auto-detected (some texture providers do not
-     *                   support this)
-     * @throws IOException if an error occurred while reading the URL
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(URL url, boolean mipmap, String fileSuffix) throws IOException, GLException {
-        if (fileSuffix == null) {
-            fileSuffix = FileUtil.getFileSuffix(url.getPath());
-        }
-        GLProfile glp = GLContext.getCurrentGL().getGLProfile();
-        TextureData data = newTextureData(glp, url, mipmap, fileSuffix);
-        Texture texture = newTexture(data);
-        data.flush();
-        return texture;
-    }
-
-    /** 
-     * Creates an OpenGL texture object associated with the given OpenGL
-     * texture target using the current OpenGL context. The texture has
-     * no initial data. This is used, for example, to construct cube
-     * maps out of multiple TextureData objects.
-     *
-     * @param target the OpenGL target type, eg GL.GL_TEXTURE_2D, 
-     *               GL.GL_TEXTURE_RECTANGLE_ARB
-     *
-     * @throws GLException if no OpenGL context is current or if an
-     *                     OpenGL error occurred
-     */
-    public static Texture newTexture(int target) throws GLException {
-        return new Texture(target);
-    }
-
-    /**
-     * Wraps an OpenGL texture ID from an external library and allows
-     * some of the base methods from the Texture class, such as
-     * binding and querying of texture coordinates, to be used with
-     * it. Attempts to update such textures' contents will yield
-     * undefined results.
-     *
-     * @param textureID the OpenGL texture object to wrap
-     * @param target the OpenGL texture target, eg GL.GL_TEXTURE_2D, 
-     *               GL2.GL_TEXTURE_RECTANGLE
-     * @param texWidth the width of the texture in pixels
-     * @param texHeight the height of the texture in pixels
-     * @param imgWidth the width of the image within the texture in
-     *          pixels (if the content is a sub-rectangle in the upper
-     *          left corner); otherwise, pass in texWidth
-     * @param imgHeight the height of the image within the texture in
-     *          pixels (if the content is a sub-rectangle in the upper
-     *          left corner); otherwise, pass in texHeight
-     * @param mustFlipVertically indicates whether the texture
-     *                           coordinates must be flipped vertically
-     *                           in order to properly display the
-     *                           texture
-     */
-    public static Texture newTexture(int textureID,
-				     int target,
-				     int texWidth,
-				     int texHeight,
-				     int imgWidth,
-				     int imgHeight,
-				     boolean mustFlipVertically) {
-	return new Texture(textureID,
-			   target,
-			   texWidth,
-			   texHeight,
-			   imgWidth,
-			   imgHeight,
-			   mustFlipVertically);
-    }
-
-    /**
-     * Writes the given texture to a file. The type of the file is
-     * inferred from its suffix. An OpenGL context must be current in
-     * order to fetch the texture data back from the OpenGL pipeline.
-     * This method causes the specified Texture to be bound to the
-     * GL_TEXTURE_2D state. If no suitable writer for the requested file
-     * format was found, throws an IOException. <P>
-     *
-     * Reasonable attempts are made to produce good results in the
-     * resulting images. The Targa, SGI and ImageIO writers produce
-     * results in the correct vertical orientation for those file
-     * formats. The DDS writer performs no vertical flip of the data,
-     * even in uncompressed mode. (It is impossible to perform such a
-     * vertical flip with compressed data.) Applications should keep
-     * this in mind when using this routine to save textures to disk for
-     * later re-loading. <P>
-     *
-     * Any mipmaps for the specified texture are currently discarded
-     * when it is written to disk, regardless of whether the underlying
-     * file format supports multiple mipmaps in a given file.
-     *
-     * @throws IOException if an error occurred during writing or no
-     *   suitable writer was found
-     * @throws GLException if no OpenGL context was current or an
-     *   OpenGL-related error occurred
-     */
-    public static void write(Texture texture, File file) throws IOException, GLException {
-        if (texture.getTarget() != GL.GL_TEXTURE_2D) {
-            throw new GLException("Only GL_TEXTURE_2D textures are supported");
-        }
-
-        // First fetch the texture data
-        GL _gl = GLContext.getCurrentGL();
-        if (!_gl.isGL2()) {
-            throw new GLException("Only GL2 supports fetching compressed images, GL: " + _gl);
-        }
-        GL2 gl = _gl.getGL2();
-
-        texture.bind();
-        int internalFormat = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_INTERNAL_FORMAT);
-        int width  = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_WIDTH);
-        int height = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_HEIGHT);
-        int border = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_BORDER);
-        TextureData data = null;
-        if (internalFormat == GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ||
-            internalFormat == GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) {
-            // Fetch using glGetCompressedTexImage
-            int size   = glGetTexLevelParameteri(gl, GL.GL_TEXTURE_2D, 0, GL2.GL_TEXTURE_COMPRESSED_IMAGE_SIZE);
-            ByteBuffer res = ByteBuffer.wrap(new byte[size]);
-            gl.glGetCompressedTexImage(GL.GL_TEXTURE_2D, 0, res);
-            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, internalFormat, GL.GL_UNSIGNED_BYTE,
-                                   false, true, true, res, null);
-        } else {
-            int bytesPerPixel = 0;
-            int fetchedFormat = 0;
-            switch (internalFormat) {
-            case GL.GL_RGB:
-            case GL2.GL_BGR:
-            case GL.GL_RGB8:
-                bytesPerPixel = 3;
-                fetchedFormat = GL.GL_RGB;
-                break;
-            case GL.GL_RGBA:
-            case GL2.GL_BGRA:
-            case GL2.GL_ABGR_EXT:
-            case GL.GL_RGBA8:
-                bytesPerPixel = 4;
-                fetchedFormat = GL.GL_RGBA;
-                break;
-            default:
-                throw new IOException("Unsupported texture internal format 0x" + Integer.toHexString(internalFormat));
-            }
-
-            // Fetch using glGetTexImage
-            int packAlignment  = glGetInteger(GL.GL_PACK_ALIGNMENT);
-            int packRowLength  = glGetInteger(GL2.GL_PACK_ROW_LENGTH);
-            int packSkipRows   = glGetInteger(GL2.GL_PACK_SKIP_ROWS);
-            int packSkipPixels = glGetInteger(GL2.GL_PACK_SKIP_PIXELS);
-            int packSwapBytes  = glGetInteger(GL2.GL_PACK_SWAP_BYTES);
-
-            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1);
-            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, 0);
-            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, 0);
-
-            ByteBuffer res = ByteBuffer.wrap(new byte[(width + (2 * border)) *
-                                                      (height + (2 * border)) *
-                                                      bytesPerPixel]);
-            if (DEBUG) {
-                System.out.println("Allocated buffer of size " + res.remaining() + " for fetched image (" +
-                                   ((fetchedFormat == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA") + ")");
-            }
-            gl.glGetTexImage(GL.GL_TEXTURE_2D, 0, fetchedFormat, GL.GL_UNSIGNED_BYTE, res);
-
-            gl.glPixelStorei(GL.GL_PACK_ALIGNMENT, packAlignment);
-            gl.glPixelStorei(GL2.GL_PACK_ROW_LENGTH, packRowLength);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_ROWS, packSkipRows);
-            gl.glPixelStorei(GL2.GL_PACK_SKIP_PIXELS, packSkipPixels);
-            gl.glPixelStorei(GL2.GL_PACK_SWAP_BYTES, packSwapBytes);
-      
-            data = new TextureData(gl.getGLProfile(), internalFormat, width, height, border, fetchedFormat, GL.GL_UNSIGNED_BYTE,
-                                   false, false, false, res, null);
-
-            if (DEBUG) {
-                System.out.println("data.getPixelFormat() = " +
-                                   ((data.getPixelFormat() == GL.GL_RGB) ? "GL_RGB" : "GL_RGBA"));
-            }
-        }
-
-        write(data, file);
-    }
-  
-    public static void write(TextureData data, File file) throws IOException, GLException {
-        for (Iterator iter = textureWriters.iterator(); iter.hasNext(); ) {
-            TextureWriter writer = (TextureWriter) iter.next();
-            if (writer.write(file, data)) {
-                return;
-            }
-        }
-
-        throw new IOException("No suitable texture writer found for "+file.getAbsolutePath());
-    }
-
-    //----------------------------------------------------------------------
-    // SPI support
-    //
-
-    /** Adds a TextureProvider to support reading of a new file
-        format. */
-    public static void addTextureProvider(TextureProvider provider) {
-        // Must always add at the front so the ImageIO provider is last,
-        // so we don't accidentally use it instead of a user's possibly
-        // more optimal provider
-        textureProviders.add(0, provider);
-    }
-
-    /** Adds a TextureWriter to support writing of a new file
-        format. */
-    public static void addTextureWriter(TextureWriter writer) {
-        // Must always add at the front so the ImageIO writer is last,
-        // so we don't accidentally use it instead of a user's possibly
-        // more optimal writer
-        textureWriters.add(0, writer);
-    }
-
-    //---------------------------------------------------------------------------
-    // Global disabling of texture rectangle extension
-    //
-
-    /** Toggles the use of the GL_ARB_texture_rectangle extension by the
-        TextureIO classes. By default, on hardware supporting this
-        extension, the TextureIO classes may use the
-        GL_ARB_texture_rectangle extension for non-power-of-two
-        textures. (If the hardware supports the
-        GL_ARB_texture_non_power_of_two extension, that one is
-        preferred.) In some situations, for example when writing
-        shaders, it is advantageous to force the texture target to
-        always be GL_TEXTURE_2D in order to have one version of the
-        shader, even at the expense of texture memory in the case where
-        NPOT textures are not supported. This method allows the use of
-        the GL_ARB_texture_rectangle extension to be turned off globally
-        for this purpose. The default is that the use of the extension
-        is enabled. */
-    public static void setTexRectEnabled(boolean enabled) {
-        texRectEnabled = enabled;
-    }
-
-    /** Indicates whether the GL_ARB_texture_rectangle extension is
-        allowed to be used for non-power-of-two textures; see {@link
-        #setTexRectEnabled setTexRectEnabled}. */
-    public static boolean isTexRectEnabled() {
-        return texRectEnabled;
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private static List/*<TextureProvider>*/ textureProviders = new ArrayList/*<TextureProvider>*/();
-    private static List/*<TextureWriter>*/   textureWriters   = new ArrayList/*<TextureWriter>*/();
-
-    static {
-        /*
-        if(GLProfile.isAWTAvailable()) {
-            // ImageIO provider, the fall-back, must be the first one added
-            try {
-                // Use reflection to avoid compile-time dependencies on AWT-related classes
-                TextureProvider provider = (TextureProvider)
-                    Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
-                addTextureProvider(provider);
-            } catch (Exception e) {
-                if (DEBUG) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        */
-
-        // Other special-case providers
-        addTextureProvider(new DDSTextureProvider());
-        addTextureProvider(new SGITextureProvider());
-        addTextureProvider(new TGATextureProvider());
-
-        /*
-        // ImageIO writer, the fall-back, must be the first one added
-        if(GLProfile.isAWTAvailable()) {
-            try {
-                // Use reflection to avoid compile-time dependencies on AWT-related classes
-                TextureWriter writer = (TextureWriter)
-                    Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
-                addTextureWriter(writer);
-            } catch (Exception e) {
-                if (DEBUG) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        */
-
-        // Other special-case writers
-        addTextureWriter(new DDSTextureWriter());
-        addTextureWriter(new SGITextureWriter());
-        addTextureWriter(new TGATextureWriter());
-        addTextureWriter(new NetPbmTextureWriter());
-    }
-
-    // Implementation methods
-    private static TextureData newTextureDataImpl(GLProfile glp, File file,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (file == null) {
-            throw new IOException("File was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, file,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given file "+file.getAbsolutePath());
-    }
-
-    private static TextureData newTextureDataImpl(GLProfile glp, InputStream stream,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (stream == null) {
-            throw new IOException("Stream was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        // Note: use of BufferedInputStream works around 4764639/4892246
-        if (!(stream instanceof BufferedInputStream)) {
-            stream = new BufferedInputStream(stream);
-        }
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, stream,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given stream");
-    }
-
-    private static TextureData newTextureDataImpl(GLProfile glp, URL url,
-                                                  int internalFormat,
-                                                  int pixelFormat,
-                                                  boolean mipmap,
-                                                  String fileSuffix) throws IOException {
-        if (url == null) {
-            throw new IOException("URL was null");
-        }
-
-        fileSuffix = toLowerCase(fileSuffix);
-
-        for (Iterator iter = textureProviders.iterator(); iter.hasNext(); ) {
-            TextureProvider provider = (TextureProvider) iter.next();
-            TextureData data = provider.newTextureData(glp, url,
-                                                       internalFormat,
-                                                       pixelFormat,
-                                                       mipmap,
-                                                       fileSuffix);
-            if (data != null) {
-                return data;
-            }
-        }
-
-        throw new IOException("No suitable reader for given URL "+url);
-    }
-
-    //----------------------------------------------------------------------
-    // DDS provider -- supports files only for now
-    static class DDSTextureProvider implements TextureProvider {
-        public TextureData newTextureData(GLProfile glp, File file,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (DDS.equals(fileSuffix) ||
-                DDS.equals(FileUtil.getFileSuffix(file))) {
-                DDSImage image = DDSImage.read(file);
-                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
-            }
-
-            return null;
-        }
-
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (DDS.equals(fileSuffix) ||
-                DDSImage.isDDSImage(stream)) {
-                DDSImage image = DDSImage.read(stream);
-                return newTextureData(glp, image, internalFormat, pixelFormat, mipmap);
-            }
-
-            return null;
-        }
-
-        public TextureData newTextureData(GLProfile glp, URL url,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream stream = new BufferedInputStream(url.openStream());
-            try {
-                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-            } finally {
-                stream.close();
-            }
-        }
-
-        private TextureData newTextureData(GLProfile glp, final DDSImage image,
-                                           int internalFormat,
-                                           int pixelFormat,
-                                           boolean mipmap) {
-            DDSImage.ImageInfo info = image.getMipMap(0);
-            if (pixelFormat == 0) {
-                switch (image.getPixelFormat()) {
-                case DDSImage.D3DFMT_R8G8B8:
-                    pixelFormat = GL.GL_RGB;
-                    break;
-                default:
-                    pixelFormat = GL.GL_RGBA;
-                    break;
-                }
-            }
-            if (info.isCompressed()) {
-                switch (info.getCompressionFormat()) {
-                case DDSImage.D3DFMT_DXT1:
-                    internalFormat = GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-                    break;
-                case DDSImage.D3DFMT_DXT3:
-                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-                    break;
-                case DDSImage.D3DFMT_DXT5:
-                    internalFormat = GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-                    break;
-                default:
-                    throw new RuntimeException("Unsupported DDS compression format \"" +
-                                               DDSImage.getCompressionFormatName(info.getCompressionFormat()) + "\"");
-                }
-            }
-            if (internalFormat == 0) {
-                switch (image.getPixelFormat()) {
-                case DDSImage.D3DFMT_R8G8B8:
-                    pixelFormat = GL.GL_RGB;
-                    break;
-                default:
-                    pixelFormat = GL.GL_RGBA;
-                    break;
-                }
-            }
-            TextureData.Flusher flusher = new TextureData.Flusher() {
-                    public void flush() {
-                        image.close();
-                    }
-                };
-            TextureData data;
-            if (mipmap && image.getNumMipMaps() > 0) {
-                Buffer[] mipmapData = new Buffer[image.getNumMipMaps()];
-                for (int i = 0; i < image.getNumMipMaps(); i++) {
-                    mipmapData[i] = image.getMipMap(i).getData();
-                }
-                data = new TextureData(glp, internalFormat,
-                                       info.getWidth(),
-                                       info.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       info.isCompressed(),
-                                       true,
-                                       mipmapData,
-                                       flusher);
-            } else {
-                // Fix this up for the end user because we can't generate
-                // mipmaps for compressed textures
-                mipmap = false;
-                data = new TextureData(glp, internalFormat,
-                                       info.getWidth(),
-                                       info.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       info.isCompressed(),
-                                       true,
-                                       info.getData(),
-                                       flusher);
-            }
-            return data;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Base class for SGI RGB and TGA image providers
-    static abstract class StreamBasedTextureProvider implements TextureProvider {
-        public TextureData newTextureData(GLProfile glp, File file,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream inStream = new BufferedInputStream(new FileInputStream(file));
-            try {
-                // The SGIImage and TGAImage implementations use InputStreams
-                // anyway so there isn't much point in having a separate code
-                // path for files
-                return newTextureData(glp, inStream,
-                                      internalFormat,
-                                      pixelFormat,
-                                      mipmap,
-                                      ((fileSuffix != null) ? fileSuffix : FileUtil.getFileSuffix(file)));
-            } finally {
-                inStream.close();
-            }
-        }
-
-        public TextureData newTextureData(GLProfile glp, URL url,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            InputStream stream = new BufferedInputStream(url.openStream());
-            try {
-                return newTextureData(glp, stream, internalFormat, pixelFormat, mipmap, fileSuffix);
-            } finally {
-                stream.close();
-            }
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // SGI RGB image provider
-    static class SGITextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (SGI.equals(fileSuffix) ||
-                SGI_RGB.equals(fileSuffix) ||
-                SGIImage.isSGIImage(stream)) {
-                SGIImage image = SGIImage.read(stream);
-                if (pixelFormat == 0) {
-                    pixelFormat = image.getFormat();
-                }
-                if (internalFormat == 0) {
-                    internalFormat = image.getFormat();
-                }
-                return new TextureData(glp, internalFormat,
-                                       image.getWidth(),
-                                       image.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       false,
-                                       false,
-                                       ByteBuffer.wrap(image.getData()),
-                                       null);
-            }
-
-            return null;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // TGA (Targa) image provider
-    static class TGATextureProvider extends StreamBasedTextureProvider {
-        public TextureData newTextureData(GLProfile glp, InputStream stream,
-                                          int internalFormat,
-                                          int pixelFormat,
-                                          boolean mipmap,
-                                          String fileSuffix) throws IOException {
-            if (TGA.equals(fileSuffix)) {
-                TGAImage image = TGAImage.read(stream);
-                if (pixelFormat == 0) {
-                    pixelFormat = image.getGLFormat();
-                }
-                if (internalFormat == 0) {
-                    GL gl = GLContext.getCurrentGL();
-                    if(gl.isGL2()) {
-                        internalFormat = GL.GL_RGBA8;
-                    } else {
-                        internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
-                    }
-                }
-                return new TextureData(glp, internalFormat,
-                                       image.getWidth(),
-                                       image.getHeight(),
-                                       0,
-                                       pixelFormat,
-                                       GL.GL_UNSIGNED_BYTE,
-                                       mipmap,
-                                       false,
-                                       false,
-                                       image.getData(),
-                                       null);
-            }
-
-            return null;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // DDS texture writer
-    //
-    static class DDSTextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            if (DDS.equals(FileUtil.getFileSuffix(file))) {
-                // See whether the DDS writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if (pixelType != GL.GL_BYTE &&
-                    pixelType != GL.GL_UNSIGNED_BYTE) {
-                    throw new IOException("DDS writer only supports byte / unsigned byte textures");
-                }
-
-                int d3dFormat = 0;
-                // FIXME: some of these are probably not completely correct and would require swizzling
-                switch (pixelFormat) {
-                case GL.GL_RGB:                        d3dFormat = DDSImage.D3DFMT_R8G8B8; break;
-                case GL.GL_RGBA:                       d3dFormat = DDSImage.D3DFMT_A8R8G8B8; break;
-                case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:  d3dFormat = DDSImage.D3DFMT_DXT1; break;
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: throw new IOException("RGBA DXT1 not yet supported");
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: d3dFormat = DDSImage.D3DFMT_DXT3; break;
-                case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: d3dFormat = DDSImage.D3DFMT_DXT5; break;
-                default: throw new IOException("Unsupported pixel format 0x" + Integer.toHexString(pixelFormat) + " by DDS writer");
-                }
-        
-                ByteBuffer[] mipmaps = null;
-                if (data.getMipmapData() != null) {
-                    mipmaps = new ByteBuffer[data.getMipmapData().length];
-                    for (int i = 0; i < mipmaps.length; i++) {
-                        mipmaps[i] = (ByteBuffer) data.getMipmapData()[i];
-                    }
-                } else {
-                    mipmaps = new ByteBuffer[] { (ByteBuffer) data.getBuffer() };
-                }
-
-                DDSImage image = DDSImage.createFromData(d3dFormat,
-                                                         data.getWidth(),
-                                                         data.getHeight(),
-                                                         mipmaps);
-                image.write(file);
-                return true;
-            }
-
-            return false;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // SGI (rgb) texture writer
-    //
-    static class SGITextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            String fileSuffix = FileUtil.getFileSuffix(file);
-            if (SGI.equals(fileSuffix) ||
-                SGI_RGB.equals(fileSuffix)) {
-                // See whether the SGI writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if ((pixelFormat == GL.GL_RGB ||
-                     pixelFormat == GL.GL_RGBA) &&
-                    (pixelType == GL.GL_BYTE ||
-                     pixelType == GL.GL_UNSIGNED_BYTE)) {
-                    ByteBuffer buf = ((data.getBuffer() != null) ?
-                                      (ByteBuffer) data.getBuffer() :
-                                      (ByteBuffer) data.getMipmapData()[0]);
-                    byte[] bytes;
-                    if (buf.hasArray()) {
-                        bytes = buf.array();
-                    } else {
-                        buf.rewind();
-                        bytes = new byte[buf.remaining()];
-                        buf.get(bytes);
-                        buf.rewind();
-                    }
-
-                    SGIImage image = SGIImage.createFromData(data.getWidth(),
-                                                             data.getHeight(),
-                                                             (pixelFormat == GL.GL_RGBA),
-                                                             bytes);
-                    image.write(file, false);
-                    return true;
-                }
-
-                throw new IOException("SGI writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-            }
-
-            return false;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // TGA (Targa) texture writer
-  
-    static class TGATextureWriter implements TextureWriter {
-        public boolean write(File file,
-                             TextureData data) throws IOException {
-            if (TGA.equals(FileUtil.getFileSuffix(file))) {
-                // See whether the TGA writer can handle this TextureData
-                int pixelFormat = data.getPixelFormat();
-                int pixelType   = data.getPixelType();
-                if ((pixelFormat == GL.GL_RGB ||
-                     pixelFormat == GL.GL_RGBA) &&
-                    (pixelType == GL.GL_BYTE ||
-                     pixelType == GL.GL_UNSIGNED_BYTE)) {
-                    ByteBuffer buf = ((data.getBuffer() != null) ?
-                                      (ByteBuffer) data.getBuffer() :
-                                      (ByteBuffer) data.getMipmapData()[0]);
-                    // Must reverse order of red and blue channels to get correct results
-                    int skip = ((pixelFormat == GL.GL_RGB) ? 3 : 4);
-                    for (int i = 0; i < buf.remaining(); i += skip) {
-                        byte red  = buf.get(i + 0);
-                        byte blue = buf.get(i + 2);
-                        buf.put(i + 0, blue);
-                        buf.put(i + 2, red);
-                    }
-
-                    TGAImage image = TGAImage.createFromData(data.getWidth(),
-                                                             data.getHeight(),
-                                                             (pixelFormat == GL.GL_RGBA),
-                                                             false,
-                                                             ((data.getBuffer() != null) ?
-                                                              (ByteBuffer) data.getBuffer() :
-                                                              (ByteBuffer) data.getMipmapData()[0]));
-                    image.write(file);
-                    return true;
-                }
-
-                throw new IOException("TGA writer doesn't support this pixel format / type (only GL_RGB/A + bytes)");
-            }
-
-            return false;
-        }    
-    }
-
-    //----------------------------------------------------------------------
-    // Helper routines
-    //
-
-    private static int glGetInteger(int pname) {
-        int[] tmp = new int[1];
-        GL gl = GLContext.getCurrentGL();
-        gl.glGetIntegerv(pname, tmp, 0);
-        return tmp[0];
-    }
-
-    private static int glGetTexLevelParameteri(GL2 gl, int target, int level, int pname) {
-        int[] tmp = new int[1];
-        gl.glGetTexLevelParameteriv(target, 0, pname, tmp, 0);
-        return tmp[0];
-    }
-
-    private static String toLowerCase(String arg) {
-        if (arg == null) {
-            return null;
-        }
-
-        return arg.toLowerCase();
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java
index e3092162d..e3092162d 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
deleted file mode 100644
index b18991dfc..000000000
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
+++ /dev/null
@@ -1,889 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.opengl.util.texture.spi;
-
-import java.io.*;
-import java.nio.*;
-
-import javax.media.opengl.*;
-import com.jogamp.opengl.util.*;
-import com.jogamp.opengl.util.texture.*;
-
-/** A reader and writer for DirectDraw Surface (.dds) files, which are
-    used to describe textures. These files can contain multiple mipmap
-    levels in one file. This class is currently minimal and does not
-    support all of the possible file formats. */
-
-public class DDSImage {
-
-    /** Simple class describing images and data; does not encapsulate
-        image format information. User is responsible for transmitting
-        that information in another way. */
-
-    public static class ImageInfo {
-        private ByteBuffer data;
-        private int width;
-        private int height;
-        private boolean isCompressed;
-        private int compressionFormat;
-
-        public ImageInfo(ByteBuffer data, int width, int height, boolean compressed, int compressionFormat) {
-            this.data = data; this.width = width; this.height = height;
-            this.isCompressed = compressed; this.compressionFormat = compressionFormat;
-        }
-        public int        getWidth()  { return width;  }
-        public int        getHeight() { return height; }
-        public ByteBuffer getData()   { return data;   }
-        public boolean    isCompressed() { return isCompressed; }
-        public int        getCompressionFormat() {
-            if (!isCompressed())
-                throw new RuntimeException("Should not call unless compressed");
-            return compressionFormat;
-        }
-    }
-
-    private ByteBuffer buf;
-    private Header header;
-
-    //
-    // Selected bits in header flags
-    //
-
-    public static final int DDSD_CAPS            = 0x00000001; // Capacities are valid
-    public static final int DDSD_HEIGHT          = 0x00000002; // Height is valid
-    public static final int DDSD_WIDTH           = 0x00000004; // Width is valid
-    public static final int DDSD_PITCH           = 0x00000008; // Pitch is valid
-    public static final int DDSD_BACKBUFFERCOUNT = 0x00000020; // Back buffer count is valid
-    public static final int DDSD_ZBUFFERBITDEPTH = 0x00000040; // Z-buffer bit depth is valid (shouldn't be used in DDSURFACEDESC2)
-    public static final int DDSD_ALPHABITDEPTH   = 0x00000080; // Alpha bit depth is valid
-    public static final int DDSD_LPSURFACE       = 0x00000800; // lpSurface is valid
-    public static final int DDSD_PIXELFORMAT     = 0x00001000; // ddpfPixelFormat is valid
-    public static final int DDSD_MIPMAPCOUNT     = 0x00020000; // Mip map count is valid
-    public static final int DDSD_LINEARSIZE      = 0x00080000; // dwLinearSize is valid
-    public static final int DDSD_DEPTH           = 0x00800000; // dwDepth is valid
-
-    public static final int DDPF_ALPHAPIXELS     = 0x00000001; // Alpha channel is present
-    public static final int DDPF_ALPHA           = 0x00000002; // Only contains alpha information
-    public static final int DDPF_FOURCC          = 0x00000004; // FourCC code is valid
-    public static final int DDPF_PALETTEINDEXED4 = 0x00000008; // Surface is 4-bit color indexed
-    public static final int DDPF_PALETTEINDEXEDTO8 = 0x00000010; // Surface is indexed into a palette which stores indices
-    // into the destination surface's 8-bit palette
-    public static final int DDPF_PALETTEINDEXED8 = 0x00000020; // Surface is 8-bit color indexed
-    public static final int DDPF_RGB             = 0x00000040; // RGB data is present
-    public static final int DDPF_COMPRESSED      = 0x00000080; // Surface will accept pixel data in the format specified
-    // and compress it during the write
-    public static final int DDPF_RGBTOYUV        = 0x00000100; // Surface will accept RGB data and translate it during
-    // the write to YUV data. The format of the data to be written
-    // will be contained in the pixel format structure. The DDPF_RGB
-    // flag will be set.
-    public static final int DDPF_YUV             = 0x00000200; // Pixel format is YUV - YUV data in pixel format struct is valid
-    public static final int DDPF_ZBUFFER         = 0x00000400; // Pixel format is a z buffer only surface
-    public static final int DDPF_PALETTEINDEXED1 = 0x00000800; // Surface is 1-bit color indexed
-    public static final int DDPF_PALETTEINDEXED2 = 0x00001000; // Surface is 2-bit color indexed
-    public static final int DDPF_ZPIXELS         = 0x00002000; // Surface contains Z information in the pixels
-
-    // Selected bits in DDS capabilities flags
-    public static final int DDSCAPS_TEXTURE      = 0x00001000; // Can be used as a texture
-    public static final int DDSCAPS_MIPMAP       = 0x00400000; // Is one level of a mip-map
-    public static final int DDSCAPS_COMPLEX      = 0x00000008; // Complex surface structure, such as a cube map
-
-    // Selected bits in DDS extended capabilities flags
-    public static final int DDSCAPS2_CUBEMAP           = 0x00000200;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000;
-    public static final int DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000;
-    public static final int DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000;
-
-    // Known pixel formats
-    public static final int D3DFMT_UNKNOWN   =  0;
-    public static final int D3DFMT_R8G8B8    =  20;
-    public static final int D3DFMT_A8R8G8B8  =  21;
-    public static final int D3DFMT_X8R8G8B8  =  22;
-    // The following are also valid FourCC codes
-    public static final int D3DFMT_DXT1      =  0x31545844;
-    public static final int D3DFMT_DXT2      =  0x32545844;
-    public static final int D3DFMT_DXT3      =  0x33545844;
-    public static final int D3DFMT_DXT4      =  0x34545844;
-    public static final int D3DFMT_DXT5      =  0x35545844;
-
-    /** Reads a DirectDraw surface from the specified file name,
-        returning the resulting DDSImage.
-
-        @param filename File name
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(String filename) throws IOException {
-        return read(new File(filename));
-    }
-  
-    /** Reads a DirectDraw surface from the specified file, returning
-        the resulting DDSImage.
-
-        @param file File object
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(File file) throws IOException {
-        DDSImage image = new DDSImage();
-        image.readFromFile(file);
-        return image;
-    }
-
-    /** Reads a DirectDraw surface from the specified InputStream, returning
-        the resulting DDSImage.
-
-        @param input Input stream
-        @return DDS image object
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static DDSImage read(InputStream input) throws IOException {
-        DDSImage image = new DDSImage();
-        image.readFromStream(input);
-        return image;
-    }
-
-    /** Closes open files and resources associated with the open
-        DDSImage. No other methods may be called on this object once
-        this is called. */
-    public void close() {
-    }
-
-    /** 
-     * Creates a new DDSImage from data supplied by the user. The
-     * resulting DDSImage can be written to disk using the write()
-     * method.
-     *
-     * @param d3dFormat the D3DFMT_ constant describing the data; it is
-     *                  assumed that it is packed tightly
-     * @param width  the width in pixels of the topmost mipmap image
-     * @param height the height in pixels of the topmost mipmap image
-     * @param mipmapData the data for each mipmap level of the resulting
-     *                   DDSImage; either only one mipmap level should
-     *                   be specified, or they all must be
-     * @throws IllegalArgumentException if the data does not match the
-     *   specified arguments
-     * @return DDS image object
-     */
-    public static DDSImage createFromData(int d3dFormat,
-                                          int width,
-                                          int height,
-                                          ByteBuffer[] mipmapData) throws IllegalArgumentException {
-        DDSImage image = new DDSImage();
-        image.initFromData(d3dFormat, width, height, mipmapData);
-        return image;
-    }
-
-    /** Determines from the magic number whether the given InputStream
-        points to a DDS image. The given InputStream must return true
-        from markSupported() and support a minimum of four bytes of
-        read-ahead.
-
-        @param in Stream to check
-        @return true if input stream is DDS image or false otherwise
-        @throws java.io.IOException if an I/O exception occurred
-    */
-    public static boolean isDDSImage(InputStream in) throws IOException {
-        if (!(in instanceof BufferedInputStream)) {
-            in = new BufferedInputStream(in);
-        }
-        if (!in.markSupported()) {
-            throw new IOException("Can not test non-destructively whether given InputStream is a DDS image");
-        }
-        in.mark(4);
-        int magic = 0;
-        for (int i = 0; i < 4; i++) {
-            int tmp = in.read();
-            if (tmp < 0) {
-                in.reset();
-                return false;
-            }
-            magic = ((magic >>> 8) | (tmp << 24));
-        }
-        in.reset();
-        return (magic == MAGIC);
-    }
-
-    /**
-     * Writes this DDSImage to the specified file name.
-     * @param filename File name to write to
-     * @throws java.io.IOException if an I/O exception occurred
-     */
-    public void write(String filename) throws IOException {
-        write(new File(filename));
-    }
-
-    /**
-     * Writes this DDSImage to the specified file name.
-     * @param file File object to write to
-     * @throws java.io.IOException if an I/O exception occurred
-     */
-    public void write(File file) throws IOException {
-        LEDataOutputStream output =
-            new LEDataOutputStream(new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))));
-        header.write(output);
-        output.write(buf.array());
-        output.close();
-    }
-
-    /** Test for presence/absence of surface description flags (DDSD_*)
-     * @param flag DDSD_* flags set to test
-     * @return true if flag present or false otherwise
-     */
-    public boolean isSurfaceDescFlagSet(int flag) {
-        return ((header.flags & flag) != 0);
-    }
-
-    /** Test for presence/absence of pixel format flags (DDPF_*) */
-    public boolean isPixelFormatFlagSet(int flag) {
-        return ((header.pfFlags & flag) != 0);
-    }
-
-    /** Gets the pixel format of this texture (D3DFMT_*) based on some
-        heuristics. Returns D3DFMT_UNKNOWN if could not recognize the
-        pixel format. */
-    public int getPixelFormat() {
-        if (isCompressed()) {
-            return getCompressionFormat();
-        } else if (isPixelFormatFlagSet(DDPF_RGB)) {
-            if (isPixelFormatFlagSet(DDPF_ALPHAPIXELS)) {
-                if (getDepth() == 32 &&
-                    header.pfRBitMask == 0x00FF0000 &&
-                    header.pfGBitMask == 0x0000FF00 &&
-                    header.pfBBitMask == 0x000000FF &&
-                    header.pfABitMask == 0xFF000000) {
-                    return D3DFMT_A8R8G8B8;
-                }
-            } else {
-                if (getDepth() == 24 &&
-                    header.pfRBitMask == 0x00FF0000 &&
-                    header.pfGBitMask == 0x0000FF00 &&
-                    header.pfBBitMask == 0x000000FF) {
-                    return D3DFMT_R8G8B8;
-                } else if (getDepth() == 32 &&
-                           header.pfRBitMask == 0x00FF0000 &&
-                           header.pfGBitMask == 0x0000FF00 &&
-                           header.pfBBitMask == 0x000000FF) {
-                    return D3DFMT_X8R8G8B8;
-                }
-            }
-        }
-
-        return D3DFMT_UNKNOWN;
-    }
-
-    /**
-     * Indicates whether this texture is cubemap
-     * @return true if cubemap or false otherwise
-     */
-    public boolean isCubemap() {
-        return ((header.ddsCaps1 & DDSCAPS_COMPLEX) != 0) && ((header.ddsCaps2 & DDSCAPS2_CUBEMAP) != 0);
-    }
-
-    /**
-     * Indicates whethe this cubemap side present
-     * @param side Side to test
-     * @return true if side present or false otherwise
-     */
-    public boolean isCubemapSidePresent(int side) {
-        return isCubemap() && (header.ddsCaps2 & side) != 0;
-    }
-
-    /** Indicates whether this texture is compressed. */
-    public boolean isCompressed() {
-        return (isPixelFormatFlagSet(DDPF_FOURCC));
-    }
-
-    /** If this surface is compressed, returns the kind of compression
-        used (DXT1..DXT5). */
-    public int getCompressionFormat() {
-        return header.pfFourCC;
-    }
-
-    /** Width of the texture (or the top-most mipmap if mipmaps are
-        present) */
-    public int getWidth() {
-        return header.width;
-    }
-
-    /** Height of the texture (or the top-most mipmap if mipmaps are
-        present) */
-    public int getHeight() {
-        return header.height;
-    }
-
-    /** Total number of bits per pixel. Only valid if DDPF_RGB is
-        present. For A8R8G8B8, would be 32. */
-    public int getDepth() {
-        return header.pfRGBBitCount;
-    }
-
-    /** Number of mip maps in the texture */
-    public int getNumMipMaps() {
-        if (!isSurfaceDescFlagSet(DDSD_MIPMAPCOUNT)) {
-            return 0;
-        }
-        return header.mipMapCountOrAux;
-    }
-
-    /** Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
-     * @param map Mipmap index
-     * @return Image object
-     */
-    public ImageInfo getMipMap(int map) {
-        return getMipMap( 0, map );
-    }
-
-    /**
-     * Gets the <i>i</i>th mipmap data (0..getNumMipMaps() - 1)
-     * @param side Cubemap side or 0 for 2D texture
-     * @param map Mipmap index
-     * @return Image object
-     */
-    public ImageInfo getMipMap(int side, int map) {
-        if (!isCubemap() && (side != 0)) {
-            throw new RuntimeException( "Illegal side for 2D texture: " + side );
-        }
-        if (isCubemap() && !isCubemapSidePresent(side)) {
-            throw new RuntimeException( "Illegal side, side not present: " + side );
-        }
-        if (getNumMipMaps() > 0 &&
-            ((map < 0) || (map >= getNumMipMaps()))) {
-            throw new RuntimeException("Illegal mipmap number " + map + " (0.." + (getNumMipMaps() - 1) + ")");
-        }
-
-        // Figure out how far to seek
-        int seek = 0;
-        if (isCubemap()) {
-            seek += sideShiftInBytes(side);
-        }
-        for (int i = 0; i < map; i++) {
-            seek += mipMapSizeInBytes(i);
-        }
-        buf.limit(seek + mipMapSizeInBytes(map));
-        buf.position(seek);
-        ByteBuffer next = buf.slice();
-        buf.position(0);
-        buf.limit(buf.capacity());
-        return new ImageInfo(next, mipMapWidth(map), mipMapHeight(map), isCompressed(), getCompressionFormat());
-    }
-
-    /** Returns an array of ImageInfos corresponding to all mipmap
-        levels of this DDS file.
-        @return Mipmap image objects set
-    */
-    public ImageInfo[] getAllMipMaps() {
-        return getAllMipMaps(0);
-    }
-
-    /**
-     * Returns an array of ImageInfos corresponding to all mipmap
-     * levels of this DDS file.
-     * @param side Cubemap side or 0 for 2D texture
-     * @return Mipmap image objects set
-     */
-    public ImageInfo[] getAllMipMaps( int side ) {
-        int numLevels = getNumMipMaps();
-        if (numLevels == 0) {
-            numLevels = 1;
-        }
-        ImageInfo[] result = new ImageInfo[numLevels];
-        for (int i = 0; i < numLevels; i++) {
-            result[i] = getMipMap(side, i);
-        }
-        return result;
-    }
-
-    /** Converts e.g. DXT1 compression format constant (see {@link
-        #getCompressionFormat}) into "DXT1".
-        @param compressionFormat Compression format constant
-        @return String format code
-    */
-    public static String getCompressionFormatName(int compressionFormat) {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < 4; i++) {
-            char c = (char) (compressionFormat & 0xFF);
-            buf.append(c);
-            compressionFormat = compressionFormat >> 8;
-        }
-        return buf.toString();
-    }
-
-    /** Allocates a temporary, empty ByteBuffer suitable for use in a
-        call to glCompressedTexImage2D. This is used by the Texture
-        class to expand non-power-of-two DDS compressed textures to
-        power-of-two sizes on hardware not supporting OpenGL 2.0 and the
-        NPOT texture extension. The specified OpenGL internal format
-        must be one of GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
-        GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
-        GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, or
-        GL_COMPRESSED_RGBA_S3TC_DXT5_EXT.
-    */
-    public static ByteBuffer allocateBlankBuffer(int width,
-                                                 int height,
-                                                 int openGLInternalFormat) {
-        int size = width * height;
-        switch (openGLInternalFormat) {
-        case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-            size /= 2;
-            break;
-
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-        case GL.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-            break;
-
-        default:
-            throw new IllegalArgumentException("Illegal OpenGL texture internal format " +
-                                               openGLInternalFormat);
-        }
-        if (size == 0)
-            size = 1;
-        return GLBuffers.newDirectByteBuffer(size);
-    }
-
-    public void debugPrint() {
-        PrintStream tty = System.err;
-        tty.println("Compressed texture: " + isCompressed());
-        if (isCompressed()) {
-            int fmt = getCompressionFormat();
-            String name = getCompressionFormatName(fmt);
-            tty.println("Compression format: 0x" + Integer.toHexString(fmt) + " (" + name + ")");
-        }
-        tty.println("Width: " + header.width + " Height: " + header.height);
-        tty.println("header.pitchOrLinearSize: " + header.pitchOrLinearSize);
-        tty.println("header.pfRBitMask: 0x" + Integer.toHexString(header.pfRBitMask));
-        tty.println("header.pfGBitMask: 0x" + Integer.toHexString(header.pfGBitMask));
-        tty.println("header.pfBBitMask: 0x" + Integer.toHexString(header.pfBBitMask));
-        tty.println("SurfaceDesc flags:");
-        boolean recognizedAny = false;
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_CAPS, "DDSD_CAPS");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_HEIGHT, "DDSD_HEIGHT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_WIDTH, "DDSD_WIDTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PITCH, "DDSD_PITCH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_BACKBUFFERCOUNT, "DDSD_BACKBUFFERCOUNT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_ALPHABITDEPTH, "DDSD_ALPHABITDEPTH");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LPSURFACE, "DDSD_LPSURFACE");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_PIXELFORMAT, "DDSD_PIXELFORMAT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_MIPMAPCOUNT, "DDSD_MIPMAPCOUNT");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_LINEARSIZE, "DDSD_LINEARSIZE");
-        recognizedAny |= printIfRecognized(tty, header.flags, DDSD_DEPTH, "DDSD_DEPTH");
-        if (!recognizedAny) {
-            tty.println("(none)");
-        }
-        tty.println("Raw SurfaceDesc flags: 0x" + Integer.toHexString(header.flags));
-        tty.println("Pixel format flags:");
-        recognizedAny = false;
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHAPIXELS, "DDPF_ALPHAPIXELS");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ALPHA, "DDPF_ALPHA");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_FOURCC, "DDPF_FOURCC");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED4, "DDPF_PALETTEINDEXED4");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXEDTO8, "DDPF_PALETTEINDEXEDTO8");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED8, "DDPF_PALETTEINDEXED8");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGB, "DDPF_RGB");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_COMPRESSED, "DDPF_COMPRESSED");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_RGBTOYUV, "DDPF_RGBTOYUV");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_YUV, "DDPF_YUV");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZBUFFER, "DDPF_ZBUFFER");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED1, "DDPF_PALETTEINDEXED1");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_PALETTEINDEXED2, "DDPF_PALETTEINDEXED2");
-        recognizedAny |= printIfRecognized(tty, header.pfFlags, DDPF_ZPIXELS, "DDPF_ZPIXELS");
-        if (!recognizedAny) {
-            tty.println("(none)");
-        }
-        tty.println("Raw pixel format flags: 0x" + Integer.toHexString(header.pfFlags));
-        tty.println("Depth: " + getDepth());
-        tty.println("Number of mip maps: " + getNumMipMaps());
-        int fmt = getPixelFormat();
-        tty.print("Pixel format: ");
-        switch (fmt) {
-        case D3DFMT_R8G8B8:   tty.println("D3DFMT_R8G8B8"); break;
-        case D3DFMT_A8R8G8B8: tty.println("D3DFMT_A8R8G8B8"); break;
-        case D3DFMT_X8R8G8B8: tty.println("D3DFMT_X8R8G8B8"); break;
-        case D3DFMT_DXT1:     tty.println("D3DFMT_DXT1"); break;
-        case D3DFMT_DXT2:     tty.println("D3DFMT_DXT2"); break;
-        case D3DFMT_DXT3:     tty.println("D3DFMT_DXT3"); break;
-        case D3DFMT_DXT4:     tty.println("D3DFMT_DXT4"); break;
-        case D3DFMT_DXT5:     tty.println("D3DFMT_DXT5"); break;
-        case D3DFMT_UNKNOWN:  tty.println("D3DFMT_UNKNOWN"); break;
-        default:              tty.println("(unknown pixel format " + fmt + ")"); break;
-        }
-    }
-
-    //----------------------------------------------------------------------
-    // Internals only below this point
-    //
-
-    private static final int MAGIC = 0x20534444;
-
-    static class Header {
-        int size;                 // size of the DDSURFACEDESC structure
-        int flags;                // determines what fields are valid
-        int height;               // height of surface to be created
-        int width;                // width of input surface
-        int pitchOrLinearSize;
-        int backBufferCountOrDepth;
-        int mipMapCountOrAux;     // number of mip-map levels requested (in this context)
-        int alphaBitDepth;        // depth of alpha buffer requested
-        int reserved1;            // reserved
-        int surface;              // pointer to the associated surface memory
-        // NOTE: following two entries are from DDCOLORKEY data structure
-        // Are overlaid with color for empty cubemap faces (unused in this reader)
-        int colorSpaceLowValue;
-        int colorSpaceHighValue;
-        int destBltColorSpaceLowValue;
-        int destBltColorSpaceHighValue;
-        int srcOverlayColorSpaceLowValue;
-        int srcOverlayColorSpaceHighValue;
-        int srcBltColorSpaceLowValue;
-        int srcBltColorSpaceHighValue;
-        // NOTE: following entries are from DDPIXELFORMAT data structure
-        // Are overlaid with flexible vertex format description of vertex
-        // buffers (unused in this reader)
-        int pfSize;                 // size of DDPIXELFORMAT structure
-        int pfFlags;                // pixel format flags
-        int pfFourCC;               // (FOURCC code)
-        // Following five entries have multiple interpretations, not just
-        // RGBA (but that's all we support right now)
-        int pfRGBBitCount;          // how many bits per pixel
-        int pfRBitMask;             // mask for red bits
-        int pfGBitMask;             // mask for green bits
-        int pfBBitMask;             // mask for blue bits
-        int pfABitMask;             // mask for alpha channel
-        int ddsCaps1;               // Texture and mip-map flags
-        int ddsCaps2;               // Advanced capabilities including cubemap support
-        int ddsCapsReserved1;
-        int ddsCapsReserved2;
-        int textureStage;           // stage in multitexture cascade
-
-        void read(LEDataInputStream input) throws IOException {
-            int magic                     = input.readInt();
-            if (magic != MAGIC) {
-                throw new IOException("Incorrect magic number 0x" +
-                                      Integer.toHexString(magic) +
-                                      " (expected " + MAGIC + ")");
-            }
-
-            size                          = input.readInt();
-            flags                         = input.readInt();
-            height                        = input.readInt();
-            width                         = input.readInt();
-            pitchOrLinearSize             = input.readInt();
-            backBufferCountOrDepth        = input.readInt();
-            mipMapCountOrAux              = input.readInt();
-            alphaBitDepth                 = input.readInt();
-            reserved1                     = input.readInt();
-            surface                       = input.readInt();
-            colorSpaceLowValue            = input.readInt();
-            colorSpaceHighValue           = input.readInt();
-            destBltColorSpaceLowValue     = input.readInt();
-            destBltColorSpaceHighValue    = input.readInt();
-            srcOverlayColorSpaceLowValue  = input.readInt();
-            srcOverlayColorSpaceHighValue = input.readInt();
-            srcBltColorSpaceLowValue      = input.readInt();
-            srcBltColorSpaceHighValue     = input.readInt();
-            pfSize                        = input.readInt();
-            pfFlags                       = input.readInt();
-            pfFourCC                      = input.readInt();
-            pfRGBBitCount                 = input.readInt();
-            pfRBitMask                    = input.readInt();
-            pfGBitMask                    = input.readInt();
-            pfBBitMask                    = input.readInt();
-            pfABitMask                    = input.readInt();
-            ddsCaps1                      = input.readInt();
-            ddsCaps2                      = input.readInt();
-            ddsCapsReserved1              = input.readInt();
-            ddsCapsReserved2              = input.readInt();
-            textureStage                  = input.readInt();
-        }
-
-        // buf must be in little-endian byte order
-        void write(LEDataOutputStream output) throws IOException {
-            output.writeInt(MAGIC);
-            output.writeInt(size);
-            output.writeInt(flags);
-            output.writeInt(height);
-            output.writeInt(width);
-            output.writeInt(pitchOrLinearSize);
-            output.writeInt(backBufferCountOrDepth);
-            output.writeInt(mipMapCountOrAux);
-            output.writeInt(alphaBitDepth);
-            output.writeInt(reserved1);
-            output.writeInt(surface);
-            output.writeInt(colorSpaceLowValue);
-            output.writeInt(colorSpaceHighValue);
-            output.writeInt(destBltColorSpaceLowValue);
-            output.writeInt(destBltColorSpaceHighValue);
-            output.writeInt(srcOverlayColorSpaceLowValue);
-            output.writeInt(srcOverlayColorSpaceHighValue);
-            output.writeInt(srcBltColorSpaceLowValue);
-            output.writeInt(srcBltColorSpaceHighValue);
-            output.writeInt(pfSize);
-            output.writeInt(pfFlags);
-            output.writeInt(pfFourCC);
-            output.writeInt(pfRGBBitCount);
-            output.writeInt(pfRBitMask);
-            output.writeInt(pfGBitMask);
-            output.writeInt(pfBBitMask);
-            output.writeInt(pfABitMask);
-            output.writeInt(ddsCaps1);
-            output.writeInt(ddsCaps2);
-            output.writeInt(ddsCapsReserved1);
-            output.writeInt(ddsCapsReserved2);
-            output.writeInt(textureStage);
-        }
-
-        private static int size() {
-            return 124;
-        }
-
-        private static int pfSize() {
-            return 32;
-        }
-
-        private static int writtenSize() {
-            return 128;
-        }
-    }
-
-    private DDSImage() {
-    }
-
-    private void readFromFile(File file) throws IOException {
-        readFromStream(new BufferedInputStream(new FileInputStream(file)));
-    }
-
-    private void readFromStream(InputStream input) throws IOException {
-        LEDataInputStream leInput = new LEDataInputStream(input);
-        header = new Header();
-        header.read(leInput);
-        fixupHeader();
-        buf = StreamUtil.readAll2Buffer(input);
-    }
-
-    private void initFromData(int d3dFormat,
-                              int width,
-                              int height,
-                              ByteBuffer[] mipmapData) throws IllegalArgumentException {
-        // Check size of mipmap data compared against format, width and
-        // height
-        int topmostMipmapSize = width * height;
-        int pitchOrLinearSize = width;
-        boolean isCompressed = false;
-        switch (d3dFormat) {
-        case D3DFMT_R8G8B8:   topmostMipmapSize *= 3; pitchOrLinearSize *= 3; break;
-        case D3DFMT_A8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
-        case D3DFMT_X8R8G8B8: topmostMipmapSize *= 4; pitchOrLinearSize *= 4; break;
-        case D3DFMT_DXT1:
-        case D3DFMT_DXT2:
-        case D3DFMT_DXT3:
-        case D3DFMT_DXT4:
-        case D3DFMT_DXT5:
-            topmostMipmapSize = computeCompressedBlockSize(width, height, 1, d3dFormat);
-            pitchOrLinearSize = topmostMipmapSize;
-            isCompressed = true;
-            break;
-        default:
-            throw new IllegalArgumentException("d3dFormat must be one of the known formats");
-        }
-    
-        // Now check the mipmaps against this size
-        int curSize = topmostMipmapSize;
-        int totalSize = 0;
-        for (int i = 0; i < mipmapData.length; i++) {
-            if (mipmapData[i].remaining() != curSize) {
-                throw new IllegalArgumentException("Mipmap level " + i +
-                                                   " didn't match expected data size (expected " + curSize + ", got " +
-                                                   mipmapData[i].remaining() + ")");
-            }
-            curSize /= 4;
-            totalSize += mipmapData[i].remaining();
-        }
-
-        // OK, create one large byte array to hold all of the mipmap data
-        byte[] data = new byte[totalSize];
-        ByteBuffer buf = ByteBuffer.wrap(data);
-        for (int i = 0; i < mipmapData.length; i++) {
-            buf.put(mipmapData[i]);
-        }
-        this.buf = buf;
-    
-        // Allocate and initialize a Header
-        header = new Header();
-        header.size = Header.size();
-        header.flags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
-        if (mipmapData.length > 1) {
-            header.flags |= DDSD_MIPMAPCOUNT;
-            header.mipMapCountOrAux = mipmapData.length;
-        }
-        header.width = width;
-        header.height = height;
-        if (isCompressed) {
-            header.flags |= DDSD_LINEARSIZE;
-            header.pfFlags |= DDPF_FOURCC;
-            header.pfFourCC = d3dFormat;
-        } else {
-            header.flags |= DDSD_PITCH;
-            // Figure out the various settings from the pixel format
-            header.pfFlags |= DDPF_RGB;
-            switch (d3dFormat) {
-            case D3DFMT_R8G8B8:   header.pfRGBBitCount = 24; break;
-            case D3DFMT_A8R8G8B8: header.pfRGBBitCount = 32; header.pfFlags |= DDPF_ALPHAPIXELS; break;
-            case D3DFMT_X8R8G8B8: header.pfRGBBitCount = 32; break;
-            }
-            header.pfRBitMask = 0x00FF0000;
-            header.pfGBitMask = 0x0000FF00;
-            header.pfBBitMask = 0x000000FF;
-            if (d3dFormat == D3DFMT_A8R8G8B8) {
-                header.pfABitMask = 0xFF000000;
-            }
-        }
-        header.pitchOrLinearSize = pitchOrLinearSize;
-        header.pfSize = Header.pfSize();
-        // Not sure whether we can get away with leaving the rest of the
-        // header blank
-    }
-
-    // Microsoft doesn't follow their own specifications and the
-    // simplest conversion using the DxTex tool to e.g. a DXT3 texture
-    // results in an illegal .dds file without either DDSD_PITCH or
-    // DDSD_LINEARSIZE set in the header's flags. This code, adapted
-    // from the DevIL library, fixes up the header in these situations.
-    private void fixupHeader() {
-        if (isCompressed() && !isSurfaceDescFlagSet(DDSD_LINEARSIZE)) {
-            // Figure out how big the linear size should be
-            int depth = header.backBufferCountOrDepth;
-            if (depth == 0) {
-                depth = 1;
-            }
-
-            header.pitchOrLinearSize = computeCompressedBlockSize(getWidth(), getHeight(), depth, getCompressionFormat());
-            header.flags |= DDSD_LINEARSIZE;
-        }
-    }
-
-    private static int computeCompressedBlockSize(int width,
-                                                  int height,
-                                                  int depth,
-                                                  int compressionFormat) {
-        int blockSize = ((width + 3)/4) * ((height + 3)/4) * ((depth + 3)/4);
-        switch (compressionFormat) {
-        case D3DFMT_DXT1:  blockSize *=  8; break;
-        default:           blockSize *= 16; break;
-        }
-        return blockSize;
-    }
-
-    private int mipMapWidth(int map) {
-        int width = getWidth();
-        for (int i = 0; i < map; i++) {
-            width >>= 1;
-        }
-        return Math.max(width, 1);
-    }
-
-    private int mipMapHeight(int map) {
-        int height = getHeight();
-        for (int i = 0; i < map; i++) {
-            height >>= 1;
-        }
-        return Math.max(height, 1);
-    }
-
-    private int mipMapSizeInBytes(int map) {
-        int width  = mipMapWidth(map);
-        int height = mipMapHeight(map);
-        if (isCompressed()) {
-            int blockSize = (getCompressionFormat() == D3DFMT_DXT1 ? 8 : 16);
-            return ((width+3)/4)*((height+3)/4)*blockSize;
-        } else {
-            return width * height * (getDepth() / 8);
-        }
-    }
-
-    private int sideSizeInBytes() {
-        int numLevels = getNumMipMaps();
-        if (numLevels == 0) {
-            numLevels = 1;
-        }
-
-        int size = 0;
-        for (int i = 0; i < numLevels; i++) {
-            size += mipMapSizeInBytes(i);
-        }
-
-        return size;
-    }
-
-    private int sideShiftInBytes(int side) {
-        int[] sides = {
-            DDSCAPS2_CUBEMAP_POSITIVEX,
-            DDSCAPS2_CUBEMAP_NEGATIVEX,
-            DDSCAPS2_CUBEMAP_POSITIVEY,
-            DDSCAPS2_CUBEMAP_NEGATIVEY,
-            DDSCAPS2_CUBEMAP_POSITIVEZ,
-            DDSCAPS2_CUBEMAP_NEGATIVEZ
-        };
-
-        int shift = 0;
-        int sideSize = sideSizeInBytes();
-        for (int i = 0; i < sides.length; i++) {
-            int temp = sides[i];
-            if ((temp & side) != 0) {
-                return shift;
-            }
-
-            shift += sideSize;
-        }
-
-        throw new RuntimeException("Illegal side: " + side);
-    }
-
-    private boolean printIfRecognized(PrintStream tty, int flags, int flag, String what) {
-        if ((flags & flag) != 0) {
-            tty.println(what);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java
index 16ba538b5..16ba538b5 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
deleted file mode 100644
index 6e6e4ab04..000000000
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.jogamp.opengl.util.texture.spi;
-
-import java.io.*;
-import java.nio.*;
-import javax.media.opengl.*;
-import com.jogamp.opengl.util.*;
-import com.jogamp.opengl.util.texture.spi.*;
-import com.jogamp.opengl.util.texture.*;
-
-/**
- * Targa image reader and writer adapted from sources of the <a href =
- * "http://java.sun.com/products/jimi/">Jimi</a> image I/O class library.
- *
- * <P>
- *
- * Image decoder for image data stored in TGA file format.
- * Currently only the original TGA file format is supported. This is
- * because the new TGA format has data at the end of the file, getting
- * to the end of a file in an InputStream orient environment presents
- * several difficulties which are avoided at the moment.
- *
- * <P>
- *
- * This is a simple decoder and is only setup to load a single image
- * from the input stream
- *
- * <P>
- *
- * @author    Robin Luiten
- * @author    Kenneth Russell
- * @version    $Revision: 1768 $
- */
-
-public class TGAImage {
-    private Header header;
-    private int    format;
-    private int    bpp;
-    private ByteBuffer data;
-
-    private TGAImage(Header header) {
-        this.header = header;
-    }
-
-    /**
-     * This class reads in all of the TGA image header in addition it also
-     * reads in the imageID field as it is convenient to handle that here.
-     *
-     * @author    Robin Luiten
-     * @version   1.1
-     */
-    public static class Header {
-        /** Set of possible file format TGA types */
-        public final static int TYPE_NEW = 0;
-        public final static int TYPE_OLD = 1;
-        public final static int TYPE_UNK = 2;               // cant rewind stream so unknown for now.
-
-        /**  Set of possible image types in TGA file */
-        public final static int NO_IMAGE = 0;               // no image data
-        public final static int UCOLORMAPPED = 1;           // uncompressed color mapped image
-        public final static int UTRUECOLOR = 2;             // uncompressed true color image
-        public final static int UBLACKWHITE = 3;            // uncompressed black and white image
-        public final static int COLORMAPPED = 9;            // compressed color mapped image
-        public final static int TRUECOLOR = 10;             // compressed true color image
-        public final static int BLACKWHITE = 11;            // compressed black and white image
-
-        /** Field image descriptor bitfield values definitions */
-        public final static int ID_ATTRIBPERPIXEL = 0xF;
-        public final static int ID_RIGHTTOLEFT = 0x10;
-        public final static int ID_TOPTOBOTTOM = 0x20;
-        public final static int ID_INTERLEAVE  = 0xC0;
-
-        /** Field image descriptor / interleave values */
-        public final static int I_NOTINTERLEAVED = 0;
-        public final static int I_TWOWAY = 1;
-        public final static int I_FOURWAY = 2;
-
-        /** Type of this TGA file format */
-        private int tgaType;
-
-        /** initial TGA image data fields */
-        private int idLength;         // byte value
-        private int colorMapType;     // byte value
-        private int imageType;        // byte value
-
-        /** TGA image colour map fields */
-        private int firstEntryIndex;
-        private int colorMapLength;
-        private byte colorMapEntrySize;
-
-        /** TGA image specification fields */
-        private int xOrigin;
-        private int yOrigin;
-        private int width;
-        private int height;
-        private byte pixelDepth;
-        private byte imageDescriptor;
-
-        private byte[] imageIDbuf;
-        private String imageID;
-
-        // For construction from user data
-        Header() {
-            tgaType = TYPE_OLD; // dont try and get footer.
-        }
-
-        Header(LEDataInputStream in) throws IOException {
-            int ret;
-
-            tgaType = TYPE_OLD; // dont try and get footer.
-
-            // initial header fields
-            idLength = in.readUnsignedByte();    
-            colorMapType = in.readUnsignedByte();
-            imageType = in.readUnsignedByte();    
-
-            // color map header fields
-            firstEntryIndex = in.readUnsignedShort();
-            colorMapLength = in.readUnsignedShort();
-            colorMapEntrySize = in.readByte();
-
-            // TGA image specification fields
-            xOrigin = in.readUnsignedShort();
-            yOrigin = in.readUnsignedShort();
-            width = in.readUnsignedShort();
-            height = in.readUnsignedShort();
-            pixelDepth = in.readByte();
-            imageDescriptor = in.readByte();
-
-            if (idLength > 0) {
-                imageIDbuf = new byte[idLength];
-                in.read(imageIDbuf, 0, idLength);
-                imageID = new String(imageIDbuf, "US-ASCII");
-            }
-        }
-
-        public int tgaType()                 { return tgaType; }
-
-        /** initial TGA image data fields */
-        public int idLength()                { return idLength; }
-        public int colorMapType()            { return colorMapType; }
-        public int imageType()               { return imageType; }
-
-        /** TGA image colour map fields */
-        public int firstEntryIndex()         { return firstEntryIndex; }
-        public int colorMapLength()          { return colorMapLength; }
-        public byte colorMapEntrySize()      { return colorMapEntrySize; }
-
-        /** TGA image specification fields */
-        public int xOrigin()                 { return xOrigin; }
-        public int yOrigin()                 { return yOrigin; }
-        public int width()                   { return width; }
-        public int height()                  { return height; }
-        public byte pixelDepth()             { return pixelDepth; }
-        public byte imageDescriptor()        { return imageDescriptor; }
-
-        /** bitfields in imageDescriptor */
-        public byte attribPerPixel()         { return (byte)(imageDescriptor & ID_ATTRIBPERPIXEL); }
-        public boolean rightToLeft()         { return ((imageDescriptor & ID_RIGHTTOLEFT) != 0); }
-        public boolean topToBottom()         { return ((imageDescriptor & ID_TOPTOBOTTOM) != 0); }
-        public byte interleave()             { return (byte)((imageDescriptor & ID_INTERLEAVE) >> 6); }
-
-        public byte[] imageIDbuf()           { return imageIDbuf; }
-        public String imageID()              { return imageID; }
-
-        public String toString() {
-            return "TGA Header " +
-                " id length: " + idLength +
-                " color map type: "+ colorMapType +
-                " image type: "+ imageType +
-                " first entry index: " + firstEntryIndex +
-                " color map length: " + colorMapLength +
-                " color map entry size: " + colorMapEntrySize +
-                " x Origin: " + xOrigin +
-                " y Origin: " + yOrigin +
-                " width: "+ width +
-                " height: "+ height +
-                " pixel depth: "+ pixelDepth +
-                " image descriptor: "+ imageDescriptor +
-                (imageIDbuf == null ? "" : (" ID String: " + imageID));
-        }
-
-        public int size() { return 18 + idLength; }
-
-        private void write(LEDataOutputStream output) throws IOException {
-            output.write(idLength);
-            output.write(colorMapType);
-            output.write(imageType);
-            output.writeShort(firstEntryIndex);
-            output.writeShort(colorMapLength);
-            output.write(colorMapEntrySize);
-            output.writeShort(xOrigin);
-            output.writeShort(yOrigin);
-            output.writeShort(width);
-            output.writeShort(height);
-            output.write(pixelDepth);
-            output.write(imageDescriptor);
-            if (idLength > 0) {
-                try {
-                    byte[] chars = imageID.getBytes("US-ASCII");
-                    output.write(chars);
-                } catch (UnsupportedEncodingException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Identifies the image type of the tga image data and loads
-     * it into the JimiImage structure. This was taken from the
-     * prototype and modified for the new Jimi structure
-     */
-    private void decodeImage(LEDataInputStream dIn) throws IOException {
-        switch (header.imageType()) {
-        case Header.UCOLORMAPPED:
-            throw new IOException("TGADecoder Uncompressed Colormapped images not supported");
-
-        case Header.UTRUECOLOR:    // pixelDepth 15, 16, 24 and 32
-            switch (header.pixelDepth) {
-            case 16:
-                throw new IOException("TGADecoder Compressed 16-bit True Color images not supported");
-
-            case 24:
-            case 32:
-                decodeRGBImageU24_32(dIn);
-                break;
-            }
-            break;
-
-        case Header.UBLACKWHITE:
-            throw new IOException("TGADecoder Uncompressed Grayscale images not supported");
-
-        case Header.COLORMAPPED:
-            throw new IOException("TGADecoder Compressed Colormapped images not supported");
-
-        case Header.TRUECOLOR:
-            throw new IOException("TGADecoder Compressed True Color images not supported");
-
-        case Header.BLACKWHITE:
-            throw new IOException("TGADecoder Compressed Grayscale images not supported");
-        }
-    }
-  
-    /**
-     * This assumes that the body is for a 24 bit or 32 bit for a
-     * RGB or ARGB image respectively.
-     */
-    private void decodeRGBImageU24_32(LEDataInputStream dIn) throws IOException {
-        int i;    // row index
-        int j;    // column index
-        int y;    // output row index
-        int raw;  // index through the raw input buffer
-        int rawWidth = header.width() * (header.pixelDepth() / 8);
-        byte[] rawBuf = new byte[rawWidth];
-        byte[] tmpData = new byte[rawWidth * header.height()];
-
-        for (i = 0; i < header.height(); ++i) {
-            dIn.readFully(rawBuf, 0, rawWidth);
-
-            if (header.topToBottom())
-                y = header.height - i - 1; // range 0 to (header.height - 1)
-            else
-                y = i;
-
-            System.arraycopy(rawBuf, 0, tmpData, y * rawWidth, rawBuf.length);
-        }
-
-        GL gl = GLContext.getCurrentGL();
-        if (header.pixelDepth() == 24) {
-            bpp=3;
-            if(gl.isGL2GL3()) {
-                format = GL2GL3.GL_BGR;
-            } else {
-                format = GL.GL_RGB;
-                swapBGR(tmpData, rawWidth, header.height(), bpp);
-            }
-        } else {
-            assert header.pixelDepth() == 32;
-            bpp=4;
-
-            if(gl.isGL2GL3()) {
-                format = GL2GL3.GL_BGRA;
-            } else {
-                format = GL.GL_RGBA;
-                swapBGR(tmpData, rawWidth, header.height(), bpp);
-            }
-        }
-
-        data = ByteBuffer.wrap(tmpData);
-    }
-
-    private static void swapBGR(byte[] data, int bWidth, int height, int bpp) {
-        byte r,b;
-        int k;
-        for(int i=0; i<height; ++i) {
-            for(int j=0; j<bWidth; j+=bpp) {
-                k=i*bWidth+j;
-                b=data[k+0];
-                r=data[k+2];
-                data[k+0]=r;
-                data[k+2]=b;
-            }
-        }
-    }
-
-    /** Returns the width of the image. */
-    public int getWidth()    { return header.width(); }
-
-    /** Returns the height of the image. */
-    public int getHeight()   { return header.height(); }
-
-    /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */
-    public int getGLFormat() { return format; }
-
-    /** Returns the bytes per pixel */
-    public int getBytesPerPixel() { return bpp; }
-
-    /** Returns the raw data for this texture in the correct
-        (bottom-to-top) order for calls to glTexImage2D. */
-    public ByteBuffer getData()  { return data; }
-
-    /** Reads a Targa image from the specified file. */
-    public static TGAImage read(String filename) throws IOException {
-        return read(new FileInputStream(filename));
-    }
-
-    /** Reads a Targa image from the specified InputStream. */
-    public static TGAImage read(InputStream in) throws IOException {
-        LEDataInputStream dIn = new LEDataInputStream(new BufferedInputStream(in));
-
-        Header header = new Header(dIn);
-        TGAImage res = new TGAImage(header);
-        res.decodeImage(dIn);
-        return res;
-    }
-
-    /** Writes the image in Targa format to the specified file name. */
-    public void write(String filename) throws IOException {
-        write(new File(filename));
-    }
-
-    /** Writes the image in Targa format to the specified file. */
-    public void write(File file) throws IOException {
-        LEDataOutputStream output =
-            new LEDataOutputStream(new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))));
-        header.write(output);
-        if (!data.isDirect()) {
-            output.write(data.array());
-        } else {
-            for (int i = 0; i < data.limit(); i++) {
-                output.write(data.get(i));
-            }
-        }
-        output.close();
-    }
-
-    /** Creates a TGAImage from data supplied by the end user. Shares
-        data with the passed ByteBuffer. Assumes the data is already in
-        the correct byte order for writing to disk, i.e., BGR or
-        BGRA. */
-    public static TGAImage createFromData(int width,
-                                          int height,
-                                          boolean hasAlpha,
-                                          boolean topToBottom,
-                                          ByteBuffer data) {
-        Header header = new Header();
-        header.imageType = Header.UTRUECOLOR;
-        header.width = width;
-        header.height = height;
-        header.pixelDepth = (byte) (hasAlpha ? 32 : 24);
-        header.imageDescriptor = (byte) (topToBottom ? Header.ID_TOPTOBOTTOM : 0);
-        // Note ID not supported
-        TGAImage ret = new TGAImage(header);
-        ret.data = data;
-        return ret;
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
index a45821d87..6e2f1b992 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
@@ -46,7 +46,7 @@ import java.net.*;
 import javax.imageio.*;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.opengl.util.texture.*;
 import com.jogamp.opengl.util.texture.awt.*;
 import com.jogamp.opengl.util.texture.spi.*;
diff --git a/src/jogl/classes/com/jogamp/openmax/OMXInstance.java b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
index d49eeb8e6..fcd055f8b 100644
--- a/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
+++ b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
@@ -5,10 +5,10 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.GLU;
 import com.jogamp.opengl.util.texture.*;
 
-import com.jogamp.opengl.impl.egl.EGL;
-import com.jogamp.opengl.impl.egl.EGLContext;
-import com.jogamp.opengl.impl.egl.EGLDrawable;
-import com.jogamp.opengl.impl.egl.EGLExt;
+import jogamp.opengl.egl.EGL;
+import jogamp.opengl.egl.EGLContext;
+import jogamp.opengl.egl.EGLDrawable;
+import jogamp.opengl.egl.EGLExt;
 
 import java.net.URL;
 import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
index ecba18147..9352ad4f3 100644
--- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
+++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
@@ -41,7 +41,7 @@
 package javax.media.opengl;
 
 import javax.media.nativewindow.NativeWindowException;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import java.util.List;
 import javax.media.nativewindow.CapabilitiesImmutable;
 
diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
index cde327a07..cf24d1028 100644
--- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
+++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
@@ -40,7 +40,7 @@
 
 package javax.media.opengl;
 
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import java.security.*;
 
 /** A higher-level abstraction than {@link GLDrawable} which supplies
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 4c9b737d5..b859dee00 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -43,7 +43,7 @@ package javax.media.opengl;
 import java.util.HashMap;
 import java.util.HashSet;
 import javax.media.nativewindow.AbstractGraphicsDevice;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 
 /** Abstraction for an OpenGL rendering context. In order to perform
     OpenGL rendering, a context must be "made current" on the current
@@ -82,6 +82,11 @@ public abstract class GLContext {
   /** <code>ARB_create_context</code> related: flag debug */
   protected static final int CTX_OPTION_DEBUG   = 1 << 6;
 
+  /** GLContext {@link com.jogamp.gluegen.runtime.ProcAddressTable} caching related: GL software implementation */
+  protected static final int CTX_IMPL_ACCEL_SOFT = 1 << 0;
+  /** GLContext {@link com.jogamp.gluegen.runtime.ProcAddressTable} caching related: GL hardware implementation */
+  protected static final int CTX_IMPL_ACCEL_HARD = 1 << 1;
+
   private static ThreadLocal currentContext = new ThreadLocal();
 
   private HashMap/*<int, Object>*/ attachedObjects = new HashMap();
@@ -606,7 +611,7 @@ public abstract class GLContext {
   }
 
   /**
-   * Called by {@link com.jogamp.opengl.impl.GLContextImpl#createContextARBMapVersionsAvailable} not intended to be used by
+   * Called by {@link jogamp.opengl.GLContextImpl#createContextARBMapVersionsAvailable} not intended to be used by
    * implementations. However, if {@link #createContextARB} is not being used within
    * {@link javax.media.opengl.GLDrawableFactory#getOrCreateSharedContext(javax.media.nativewindow.AbstractGraphicsDevice)},
    * GLProfile has to map the available versions.
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 500173cf2..395ee3704 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -46,7 +46,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.jogamp.common.JogampRuntimeException;
-import com.jogamp.common.impl.Debug;
+import jogamp.common.Debug;
 import com.jogamp.common.util.ReflectionUtil;
 
 import javax.media.nativewindow.AbstractGraphicsDevice;
@@ -92,8 +92,8 @@ public abstract class GLDrawableFactory {
   private static final GLDrawableFactory eglFactory;
   private static final GLDrawableFactory nativeOSFactory;
   private static final String nativeOSType;
-  static final String macosxFactoryClassNameCGL = "com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory";
-  static final String macosxFactoryClassNameAWTCGL = "com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory";
+  static final String macosxFactoryClassNameCGL = "jogamp.opengl.macosx.cgl.MacOSXCGLDrawableFactory";
+  static final String macosxFactoryClassNameAWTCGL = "jogamp.opengl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory";
 
   protected static ArrayList/*<GLDrawableFactoryImpl>*/ glDrawableFactories = new ArrayList();
 
@@ -119,9 +119,9 @@ public abstract class GLDrawableFactory {
     ClassLoader cl = GLDrawableFactory.class.getClassLoader();
     if (null == factoryClassName) {
         if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) {
-          factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory";
+          factoryClassName = "jogamp.opengl.x11.glx.X11GLXDrawableFactory";
         } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) {
-          factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory";
+          factoryClassName = "jogamp.opengl.windows.wgl.WindowsWGLDrawableFactory";
         } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) {
             if(ReflectionUtil.isClassAvailable(macosxFactoryClassNameAWTCGL, cl)) {
                 factoryClassName = macosxFactoryClassNameAWTCGL;
@@ -152,7 +152,7 @@ public abstract class GLDrawableFactory {
 
     tmp = null;
     try {
-        tmp = (GLDrawableFactory) ReflectionUtil.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory", cl);
+        tmp = (GLDrawableFactory) ReflectionUtil.createInstance("jogamp.opengl.egl.EGLDrawableFactory", cl);
     } catch (JogampRuntimeException jre) {
         if (GLProfile.DEBUG) {
             System.err.println("Info: GLDrawableFactory.static - EGLDrawableFactory - not available");
diff --git a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
index 590e88ab7..926651c1d 100644
--- a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
@@ -39,7 +39,7 @@ package javax.media.opengl;
 import java.lang.reflect.*;
 import java.util.StringTokenizer;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 /**
  * Factory for pipelining GL instances
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 10d92b050..b2f63cec4 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -37,22 +37,26 @@
 
 package javax.media.opengl;
 
+import jogamp.opengl.Debug;
+import jogamp.opengl.GLDrawableFactoryImpl;
+import jogamp.opengl.GLDynamicLookupHelper;
+import jogamp.opengl.DesktopGLDynamicLookupHelper;
+
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.jvm.JVMUtil;
 import com.jogamp.common.util.ReflectionUtil;
 import com.jogamp.common.util.VersionUtil;
 import com.jogamp.nativewindow.NativeWindowVersion;
-import com.jogamp.opengl.impl.Debug;
-import com.jogamp.opengl.impl.GLDrawableFactoryImpl;
-import com.jogamp.opengl.impl.GLDynamicLookupHelper;
-import com.jogamp.opengl.impl.DesktopGLDynamicLookupHelper;
 import com.jogamp.opengl.JoglVersion;
+
 import javax.media.nativewindow.AbstractGraphicsDevice;
-import javax.media.opengl.fixedfunc.GLPointerFunc;
 import javax.media.nativewindow.NativeWindowFactory;
+import javax.media.opengl.fixedfunc.GLPointerFunc;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.security.*;
 import java.util.List;
 
 /**
@@ -1173,7 +1177,7 @@ public class GLProfile {
         isAWTAvailable = NativeWindowFactory.isAWTAvailable() &&
                          ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas", classloader) ; // JOGL
 
-        hasGL234Impl   = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl", classloader);
+        hasGL234Impl   = ReflectionUtil.isClassAvailable("jogamp.opengl.gl4.GL4bcImpl", classloader);
         
         //
         // Iteration of desktop GL availability detection
@@ -1216,7 +1220,7 @@ public class GLProfile {
             defaultDevice = defaultDesktopDevice;
         }
 
-        if ( ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDrawableFactory", classloader) ) {
+        if ( ReflectionUtil.isClassAvailable("jogamp.opengl.egl.EGLDrawableFactory", classloader) ) {
             t=null;
             try {
                 eglFactory = (GLDrawableFactoryImpl) GLDrawableFactory.getFactoryImpl(GLES2);
@@ -1547,11 +1551,11 @@ public class GLProfile {
              GL3bc.equals(profileImpl) ||
              GL3.equals(profileImpl)   ||
              GL2.equals(profileImpl) ) {
-            return "com.jogamp.opengl.impl.gl4.GL4bc";
+            return "jogamp.opengl.gl4.GL4bc";
         } else if(GLES1.equals(profileImpl) || GL2ES1.equals(profileImpl)) {
-            return "com.jogamp.opengl.impl.es1.GLES1";
+            return "jogamp.opengl.es1.GLES1";
         } else if(GLES2.equals(profileImpl) || GL2ES2.equals(profileImpl)) {
-            return "com.jogamp.opengl.impl.es2.GLES2";
+            return "jogamp.opengl.es2.GLES2";
         } else {
             throw new GLException("unsupported profile \"" + profileImpl + "\"");
         }
diff --git a/src/jogl/classes/javax/media/opengl/Threading.java b/src/jogl/classes/javax/media/opengl/Threading.java
index e58792b8f..d0f3ebb93 100644
--- a/src/jogl/classes/javax/media/opengl/Threading.java
+++ b/src/jogl/classes/javax/media/opengl/Threading.java
@@ -39,7 +39,7 @@
 
 package javax.media.opengl;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 /** This API provides access to the threading model for the implementation of 
     the classes in this package.
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 75b9ec375..b7ec1ec1a 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -92,10 +92,10 @@ import com.jogamp.common.util.VersionUtil;
 import com.jogamp.opengl.JoglVersion;
 
 import com.jogamp.common.util.locks.RecursiveLock;
-import com.jogamp.opengl.impl.Debug;
-import com.jogamp.opengl.impl.GLContextImpl;
-import com.jogamp.opengl.impl.GLDrawableHelper;
-import com.jogamp.opengl.impl.ThreadingImpl;
+import jogamp.opengl.Debug;
+import jogamp.opengl.GLContextImpl;
+import jogamp.opengl.GLDrawableHelper;
+import jogamp.opengl.ThreadingImpl;
 
 // FIXME: Subclasses need to call resetGLFunctionAvailability() on their
 // context whenever the displayChanged() function is called on our
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 46c799d71..d58ad0304 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -83,14 +83,14 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.GLRunnable;
 import javax.media.opengl.Threading;
 import com.jogamp.opengl.util.FBObject;
-import com.jogamp.opengl.impl.Debug;
-import com.jogamp.opengl.impl.GLContextImpl;
-import com.jogamp.opengl.impl.GLDrawableFactoryImpl;
-import com.jogamp.opengl.impl.GLDrawableHelper;
-import com.jogamp.opengl.impl.GLDrawableImpl;
-import com.jogamp.opengl.impl.ThreadingImpl;
-import com.jogamp.opengl.impl.awt.Java2D;
-import com.jogamp.opengl.impl.awt.Java2DGLContext;
+import jogamp.opengl.Debug;
+import jogamp.opengl.GLContextImpl;
+import jogamp.opengl.GLDrawableFactoryImpl;
+import jogamp.opengl.GLDrawableHelper;
+import jogamp.opengl.GLDrawableImpl;
+import jogamp.opengl.ThreadingImpl;
+import jogamp.opengl.awt.Java2D;
+import jogamp.opengl.awt.Java2DGLContext;
 
 // FIXME: Subclasses need to call resetGLFunctionAvailability() on their
 // context whenever the displayChanged() function is called on their
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
index 72ad68ceb..0f05619a4 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
@@ -352,5 +352,5 @@ public interface GLUtessellatorCallback {
    */
   public void errorData(int errnum, Object polygonData);
 
-  //void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh);
+  //void mesh(jogamp.opengl.tessellator.GLUmesh mesh);
 }
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
index f380f4698..bd12dfb9d 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
@@ -68,7 +68,7 @@ public class GLUtessellatorCallbackAdapter implements GLUtessellatorCallback {
     public void edgeFlag(boolean boundaryEdge) {}
     public void vertex(Object vertexData) {}
     public void end() {}
-//  public void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh) {}
+//  public void mesh(jogamp.opengl.tessellator.GLUmesh mesh) {}
     public void error(int errnum) {}
     public void combine(double[] coords, Object[] data,
                             float[] weight, Object[] outData) {}
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/Debug.java b/src/jogl/classes/jogamp/opengl/Debug.java
index 82a5f2ff2..83c79c1d3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/Debug.java
+++ b/src/jogl/classes/jogamp/opengl/Debug.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.security.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java
index 5cacf5087..dc33541e6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLookupHelper.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java
index 77b6ba981..4879c617e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLookupHelper.java
+++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import com.jogamp.common.os.NativeLibrary;
 import java.util.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java b/src/jogl/classes/jogamp/opengl/ExtensionAvailabilityCache.java
index a5fa98bb3..b5223a5b6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
+++ b/src/jogl/classes/jogamp/opengl/ExtensionAvailabilityCache.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import javax.media.opengl.*;
 import java.util.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java b/src/jogl/classes/jogamp/opengl/GLBufferSizeTracker.java
index 6ebda222b..15e3affee 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java
+++ b/src/jogl/classes/jogamp/opengl/GLBufferSizeTracker.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import javax.media.opengl.*;
 import com.jogamp.common.util.IntLongHashMap;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
index 680fdc97b..d028bf98d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java
+++ b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import javax.media.opengl.*;
 import com.jogamp.common.util.IntIntHashMap;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index c597e5d88..478acba4e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -798,10 +798,15 @@ public abstract class GLContextImpl extends GLContext {
    *
    * @param force force the setting, even if is already being set.
    *              This might be useful if you change the OpenGL implementation.
+   * @param major OpenGL major version
+   * @param minor OpenGL minor version
+   * @param ctxProfileBits OpenGL context profile and option bits, see {@link javax.media.opengl.GLContext#CTX_OPTION_ANY}
    *
    * @see #setContextVersion
+   * @see javax.media.opengl.GLContext#CTX_OPTION_ANY
+   * @see javax.media.opengl.GLContext#CTX_PROFILE_COMPAT
    */
-  protected final void setGLFunctionAvailability(boolean force, int major, int minor, int ctp) {
+  protected final void setGLFunctionAvailability(boolean force, int major, int minor, int ctxProfileBits) {
     if(null!=this.gl && null!=glProcAddressTable && !force) {
         return; // already done and not forced
     }
@@ -813,7 +818,8 @@ public abstract class GLContextImpl extends GLContext {
 
     AbstractGraphicsConfiguration aconfig = drawable.getNativeSurface().getGraphicsConfiguration().getNativeGraphicsConfiguration();
     AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice();
-    contextFQN = getContextFQN(adevice, major, minor, ctp);
+    final int ctxImplBits = drawable.getChosenGLCapabilities().getHardwareAccelerated() ? GLContext.CTX_IMPL_ACCEL_HARD : GLContext.CTX_IMPL_ACCEL_SOFT;
+    contextFQN = getContextFQN(adevice, major, minor, ctxProfileBits, ctxImplBits);
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Context FQN: "+contextFQN);
     }
@@ -856,7 +862,7 @@ public abstract class GLContextImpl extends GLContext {
     //
     // Set GL Version
     //
-    setContextVersion(major, minor, ctp);
+    setContextVersion(major, minor, ctxProfileBits);
 
     //
     // Update ExtensionAvailabilityCache
@@ -982,8 +988,8 @@ public abstract class GLContextImpl extends GLContext {
       return false;
   }
 
-  protected static String getContextFQN(AbstractGraphicsDevice device, int major, int minor, int ctp) {
-      return device.getUniqueID() + "-" + toHexString(compose8bit(major, minor, ctp, 0));
+  protected static String getContextFQN(AbstractGraphicsDevice device, int major, int minor, int ctxProfileBits, int ctxImplBits) {
+      return device.getUniqueID() + "-" + toHexString(compose8bit(major, minor, ctxProfileBits, ctxImplBits));
   }
 
   protected String getContextFQN() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java b/src/jogl/classes/jogamp/opengl/GLContextLock.java
index ea78f5209..f725508d8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextLock.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import javax.media.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java b/src/jogl/classes/jogamp/opengl/GLContextShareSet.java
index 7be06b698..bbb46148c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextShareSet.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 // FIXME: refactor Java SE dependencies
 // import java.awt.GraphicsConfiguration;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
index 51c87b9ec..585590170 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.nio.*;
 import javax.media.nativewindow.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
index 4aae89bcf..fe2b374a0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.util.*;
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
index 5459d886c..af14e5f43 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java
index 34d1e9f8b..bedf431f5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import com.jogamp.common.os.DynamicLibraryBundleInfo;
 import java.util.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDynamicLookupHelper.java b/src/jogl/classes/jogamp/opengl/GLDynamicLookupHelper.java
index c88e96c5e..d2dac8148 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDynamicLookupHelper.java
+++ b/src/jogl/classes/jogamp/opengl/GLDynamicLookupHelper.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import com.jogamp.common.os.DynamicLibraryBundle;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationFactory.java
index 62770daf8..e51e997a3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationFactory.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.util.List;
 import javax.media.nativewindow.CapabilitiesChooser;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLGraphicsConfigurationUtil.java b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java
index 529b32f2c..066ea8120 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLGraphicsConfigurationUtil.java
+++ b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.util.ArrayList;
 import javax.media.opengl.GLCapabilities;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java b/src/jogl/classes/jogamp/opengl/GLPbufferImpl.java
index 5119f5360..671390fbb 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLPbufferImpl.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import com.jogamp.common.util.locks.RecursiveLock;
 import javax.media.nativewindow.NativeSurface;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLRunnableTask.java b/src/jogl/classes/jogamp/opengl/GLRunnableTask.java
index a2a6939cd..e5b66b985 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLRunnableTask.java
+++ b/src/jogl/classes/jogamp/opengl/GLRunnableTask.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import javax.media.opengl.GLRunnable;
 import javax.media.opengl.GLAutoDrawable;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java b/src/jogl/classes/jogamp/opengl/GLStateTracker.java
index 9d896b7f8..22874c0c3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java
+++ b/src/jogl/classes/jogamp/opengl/GLStateTracker.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLVersionNumber.java b/src/jogl/classes/jogamp/opengl/GLVersionNumber.java
index fa1c5c0c4..5bd008f83 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLVersionNumber.java
+++ b/src/jogl/classes/jogamp/opengl/GLVersionNumber.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.util.StringTokenizer;
 import com.jogamp.common.util.VersionNumber;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java b/src/jogl/classes/jogamp/opengl/GLWorkerThread.java
index c292de778..e57cbe0bc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java
+++ b/src/jogl/classes/jogamp/opengl/GLWorkerThread.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.security.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/MemoryObject.java b/src/jogl/classes/jogamp/opengl/MemoryObject.java
index a691a6156..71a6b4908 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/MemoryObject.java
+++ b/src/jogl/classes/jogamp/opengl/MemoryObject.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java b/src/jogl/classes/jogamp/opengl/ProjectFloat.java
index ab277e704..a6316b242 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java
+++ b/src/jogl/classes/jogamp/opengl/ProjectFloat.java
@@ -112,7 +112,7 @@
  * in the design, construction, operation or maintenance of any nuclear
  * facility.
  */
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/SharedResourceRunner.java b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
index 765c6620d..386679992 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/SharedResourceRunner.java
+++ b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase b/src/jogl/classes/jogamp/opengl/SystemUtil.java
index dbb717a32..befe1a315 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase
+++ b/src/jogl/classes/jogamp/opengl/SystemUtil.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 public class SystemUtil {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java b/src/jogl/classes/jogamp/opengl/ThreadingImpl.java
index d434f5175..d63699aad 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
+++ b/src/jogl/classes/jogamp/opengl/ThreadingImpl.java
@@ -32,7 +32,7 @@
  * 
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
@@ -105,10 +105,10 @@ public class ThreadingImpl {
                             // try to fetch the AWTThreadingPlugin
                             Exception error=null;
                             try {
-                                threadingPluginObj = ReflectionUtil.createInstance("com.jogamp.opengl.impl.awt.AWTThreadingPlugin", cl);
+                                threadingPluginObj = ReflectionUtil.createInstance("jogamp.opengl.awt.AWTThreadingPlugin", cl);
                             } catch (JogampRuntimeException jre) { error = jre; }
                             if(AWT == mode && null==threadingPluginObj) {                                
-                                throw new GLException("Mode is AWT, but class 'com.jogamp.opengl.impl.awt.AWTThreadingPlugin' is not available", error);
+                                throw new GLException("Mode is AWT, but class 'jogamp.opengl.awt.AWTThreadingPlugin' is not available", error);
                             }
                         }
                         return threadingPluginObj;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java b/src/jogl/classes/jogamp/opengl/ThreadingPlugin.java
index 37e4aac70..0b0748b59 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java
+++ b/src/jogl/classes/jogamp/opengl/ThreadingPlugin.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl;
+package jogamp.opengl;
 
 import javax.media.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java b/src/jogl/classes/jogamp/opengl/awt/AWTThreadingPlugin.java
index a91ab785b..a681c5b8f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java
+++ b/src/jogl/classes/jogamp/opengl/awt/AWTThreadingPlugin.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.awt;
+package jogamp.opengl.awt;
 
 import javax.media.opengl.*;
 
@@ -47,7 +47,7 @@ import java.awt.event.*;
 import java.awt.EventQueue;
 import java.lang.reflect.InvocationTargetException;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class AWTThreadingPlugin implements ThreadingPlugin {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java b/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java
index 081d1f9b3..29328f216 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
+++ b/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java
@@ -35,9 +35,9 @@
  * facility.
  */
 
-package com.jogamp.opengl.impl.awt;
+package jogamp.opengl.awt;
 
-import com.jogamp.nativewindow.impl.jawt.*;
+import jogamp.nativewindow.jawt.*;
 
 import javax.media.opengl.*;
 
@@ -57,7 +57,7 @@ public class AWTUtil {
     headlessMode = GraphicsEnvironment.isHeadless();
     if(!headlessMode) {
         try {
-            j2dClazz = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
+            j2dClazz = Class.forName("jogamp.opengl.awt.Java2D");
             isOGLPipelineActive = j2dClazz.getMethod("isOGLPipelineActive", null);
             isQueueFlusherThread = j2dClazz.getMethod("isQueueFlusherThread", null);
             j2dOk = true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java b/src/jogl/classes/jogamp/opengl/awt/Java2D.java
index 5566a3a4a..d57cde12a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java
+++ b/src/jogl/classes/jogamp/opengl/awt/Java2D.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.awt;
+package jogamp.opengl.awt;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 import java.awt.*;
 import java.awt.image.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java b/src/jogl/classes/jogamp/opengl/awt/Java2DGLContext.java
index 07bc54b6a..4a5b1db54 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/awt/Java2DGLContext.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.awt;
+package jogamp.opengl.awt;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import java.awt.Graphics;
 
 /** Provides a construct by which the shared GLJPanel code can
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index 107d7fbbb..864b9583d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -33,10 +33,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver;
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java
index 4120b0167..7ffbf9053 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java
@@ -34,10 +34,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
-import com.jogamp.opengl.impl.GLDynamicLookupHelper;
-import com.jogamp.opengl.impl.GLDrawableImpl;
+import jogamp.opengl.GLDynamicLookupHelper;
+import jogamp.opengl.GLDrawableImpl;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
index c32f2f22c..b6f5dabd3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
@@ -34,7 +34,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.egl.EGLGraphicsDevice;
@@ -42,8 +42,8 @@ import javax.media.opengl.*;
 
 import com.jogamp.common.JogampRuntimeException;
 import com.jogamp.common.util.*;
-import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.ProxySurface;
+import jogamp.opengl.*;
+import jogamp.nativewindow.ProxySurface;
 
 import java.util.HashMap;
 import java.util.List;
@@ -61,7 +61,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         // Check for other underlying stuff ..
         if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) {
             try {
-                ReflectionUtil.createInstance("com.jogamp.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory", EGLDrawableFactory.class.getClassLoader());
+                ReflectionUtil.createInstance("jogamp.opengl.x11.glx.X11GLXGraphicsConfigurationFactory", EGLDrawableFactory.class.getClassLoader());
             } catch (JogampRuntimeException jre) { /* n/a .. */ }
         }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
index 5b4a59cd0..22d39fdae 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
@@ -26,14 +26,14 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import com.jogamp.common.os.DynamicLookupHelper;
 import com.jogamp.common.os.NativeLibrary;
 import java.util.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import java.security.*;
 
 /**
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
index 1507dc8c6..a62c847ca 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
@@ -26,10 +26,10 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import java.util.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo {
     static List/*<String>*/ glueLibNames;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
index 3c02aec88..0477fc2c7 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
@@ -26,10 +26,10 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import java.util.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo {
     static List/*<String>*/ glueLibNames;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLExternalContext.java
index ae8b5bf70..78c23f710 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLExternalContext.java
@@ -33,10 +33,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import javax.media.nativewindow.*;
 
 public class EGLExternalContext extends EGLContext {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
index db6d485e3..cead0358d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGLCapabilities.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import java.util.Comparator;
 import javax.media.opengl.GLCapabilities;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
index eca324046..eb8bd522e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java
@@ -34,7 +34,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import java.util.ArrayList;
 import javax.media.nativewindow.*;
@@ -42,7 +42,7 @@ import javax.media.nativewindow.egl.*;
 import javax.media.opengl.*;
 import com.jogamp.common.nio.PointerBuffer;
 import com.jogamp.common.util.ReflectionUtil;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
index 3e3d4f964..78c0da6a5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
@@ -31,7 +31,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.nativewindow.AbstractGraphicsConfiguration;
 import javax.media.nativewindow.AbstractGraphicsDevice;
@@ -50,8 +50,8 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.GLDrawableFactory;
 
 import com.jogamp.common.nio.PointerBuffer;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil;
+import jogamp.opengl.GLGraphicsConfigurationFactory;
+import jogamp.opengl.GLGraphicsConfigurationUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -64,7 +64,7 @@ import java.io.PrintStream;
     GraphicsDevice and GraphicsConfiguration abstractions. */
 
 public class EGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory {
-    protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || com.jogamp.opengl.impl.Debug.debug("EGL");
+    protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || jogamp.opengl.Debug.debug("EGL");
     static EGLGLCapabilities.EglCfgIDComparator EglCfgIDComparator = new EGLGLCapabilities.EglCfgIDComparator();
 
     EGLGraphicsConfigurationFactory() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenContext.java
index cb8b01d8d..dd0a3db3a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenContext.java
@@ -33,11 +33,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 import java.nio.*;
 import java.util.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenDrawable.java
index 820ac04e9..4359f2ac3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferContext.java
index 5c634b9bd..2cad7daac 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferContext.java
@@ -33,11 +33,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 import java.nio.*;
 import java.util.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java
index 3189324d1..6cbd1ee6a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.egl;
+package jogamp.opengl.egl;
 
 import javax.media.nativewindow.NativeSurface;
 import javax.media.nativewindow.SurfaceChangeable;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java b/src/jogl/classes/jogamp/opengl/gl2/ProjectDouble.java
index 98cc3f323..9165dbc4b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java
+++ b/src/jogl/classes/jogamp/opengl/gl2/ProjectDouble.java
@@ -112,12 +112,12 @@
  * in the design, construction, operation or maintenance of any nuclear
  * facility.
  */
-package com.jogamp.opengl.impl.gl2;
+package jogamp.opengl.gl2;
 
 import java.nio.*;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.common.nio.Buffers;
 
 /**
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java b/src/jogl/classes/jogamp/opengl/gl2/Util.java
index a542dcf19..83f98a65f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java
+++ b/src/jogl/classes/jogamp/opengl/gl2/Util.java
@@ -66,9 +66,9 @@
  * facility.
  */
 
-package com.jogamp.opengl.impl.gl2;
+package jogamp.opengl.gl2;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 import java.nio.IntBuffer;
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java b/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java
index 6ee29b876..903a82fac 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java
+++ b/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.gl2;
+package jogamp.opengl.gl2;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 import java.nio.*;
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java b/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java
index d7e6a23c1..5eb73cd2e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java
+++ b/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java
@@ -113,7 +113,7 @@
  * facility.
  */
 
-package com.jogamp.opengl.impl.glu;
+package jogamp.opengl.glu;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java b/src/jogl/classes/jogamp/opengl/glu/Glue.java
index 7c360c574..636d17f29 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java
+++ b/src/jogl/classes/jogamp/opengl/glu/Glue.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu;
+package jogamp.opengl.glu;
 
 /**
  *
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java b/src/jogl/classes/jogamp/opengl/glu/error/Error.java
index 7c7e6b0d8..2f49db9a4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java
+++ b/src/jogl/classes/jogamp/opengl/glu/error/Error.java
@@ -42,11 +42,11 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.error;
+package jogamp.opengl.glu.error;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.glu.GLU;
-import com.jogamp.opengl.impl.glu.Glue;
+import jogamp.opengl.glu.Glue;
 
 /**
  *
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2Backend.java
index 42ddeea50..2cc5e06ae 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java
+++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2Backend.java
@@ -1,5 +1,5 @@
-package com.jogamp.opengl.impl.glu.gl2.nurbs;
-import com.jogamp.opengl.impl.glu.nurbs.*;
+package jogamp.opengl.glu.gl2.nurbs;
+import jogamp.opengl.glu.nurbs.*;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2CurveEvaluator.java
index adb8c51d8..043edac89 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
+++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2CurveEvaluator.java
@@ -1,5 +1,5 @@
-package com.jogamp.opengl.impl.glu.gl2.nurbs;
-import com.jogamp.opengl.impl.glu.nurbs.*;
+package jogamp.opengl.glu.gl2.nurbs;
+import jogamp.opengl.glu.nurbs.*;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
index 393601ff7..bc63994cb 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
+++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
@@ -1,5 +1,5 @@
-package com.jogamp.opengl.impl.glu.gl2.nurbs;
-import com.jogamp.opengl.impl.glu.nurbs.*;
+package jogamp.opengl.glu.gl2.nurbs;
+import jogamp.opengl.glu.nurbs.*;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
index 13b68138c..bd0eaf771 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
+++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
@@ -1,5 +1,5 @@
-package com.jogamp.opengl.impl.glu.gl2.nurbs;
-import com.jogamp.opengl.impl.glu.nurbs.*;
+package jogamp.opengl.glu.gl2.nurbs;
+import jogamp.opengl.glu.nurbs.*;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/BuildMipmap.java
index 42f55f982..f5fe17a7b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/BuildMipmap.java
@@ -42,12 +42,12 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
 import javax.media.opengl.glu.GLU;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.common.nio.Buffers;
 import java.nio.*;
 import java.io.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract.java
index be86585e7..a564269fb 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1010102.java
index 7e172b1ce..10ea1d729 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1010102.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1555rev.java
index 37895096e..1234da5f8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1555rev.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract2101010rev.java
index 077f3037b..226254f99 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract2101010rev.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract233rev.java
index fa35c6fbc..9fa2a3a54 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract233rev.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract332.java
index 35936466c..92d141be5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract332.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444.java
index bac4f57aa..af99d154c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444rev.java
index b1bea75e1..e5bce60d8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444rev.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract5551.java
index a6247844f..5c383103e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract5551.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565.java
index 624a4f3f2..f6193dd2d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565rev.java
index 4ab6d7e98..2e455adfa 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565rev.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888.java
index 90d7e57c9..137fa3c21 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888rev.java
index 10970573b..2ac942c84 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888rev.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractFloat.java
index c42799470..52c2191b9 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractFloat.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractPrimitive.java
index 8b986d6d0..926096649 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractPrimitive.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSByte.java
index 4f61015f4..2e1a9a0a6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSByte.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSInt.java
index 2d5ac5329..ca80747c4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSInt.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSShort.java
index 8b8d50cbf..979c3b449 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSShort.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUByte.java
index d33213f89..4d14212ab 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUByte.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUInt.java
index 873668a43..c088ca301 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUInt.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUShort.java
index 86bbb95f1..81db60f0f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUShort.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/HalveImage.java
index 893d33c66..7549044ba 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/HalveImage.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import javax.media.opengl.GL;
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Image.java
index b2aaad2f7..b610ce86b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Image.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java
index 4e3f6c298..f38b62e37 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/PixelStorageModes.java
index 43b5c5691..0b1af8323 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/PixelStorageModes.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 /**
  *
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ScaleInternal.java
index 804845fe2..5f086ceff 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ScaleInternal.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Type_Widget.java
index 0aeca8f1c..38113f601 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java
+++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Type_Widget.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.mipmap;
+package jogamp.opengl.glu.mipmap;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Arc.java
index 9ee2494a1..422f8d4df 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Arc.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
 ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcSdirSorter.java
index 3955e3176..0d04d4cd6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcSdirSorter.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTdirSorter.java
index 098ba97b7..bee98b8c3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTdirSorter.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTesselator.java
index edfb8905f..2e4d3eb96 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTesselator.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Backend.java
index 39097720c..4959f8000 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Backend.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/BezierArc.java
index d9b390b67..9f7984bb7 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/BezierArc.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Bin.java
index 61316f348..df8b16ab5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Bin.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Breakpt.java
index b5b88ad96..f45571dac 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Breakpt.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfArcs.java
index 0646e1d9f..aaa8cb5f2 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfArcs.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /**
  * Class replacing C language pointer
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfBreakpts.java
index e47fdf966..5112b07fc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfBreakpts.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /**
  * Class replacing C language pointer
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfFloats.java
index 60cef9919..39ef841ec 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfFloats.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /**
  * Class replacing C language pointer
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfQuiltspecs.java
index ef16a8204..4b21f2d50 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfQuiltspecs.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /**
  * Class replacing C language pointer
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curve.java
index fb1a5acea..b0ff4e6e5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curve.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CurveEvaluator.java
index c27ffd4c4..92dadf648 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CurveEvaluator.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curvelist.java
index fc3018833..80baf207b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curvelist.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/DisplayList.java
index 39a3a28f4..5c80ffd30 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/DisplayList.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Flist.java
index 00757ed7e..6983691d9 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Flist.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotspec.java
index 9251aa231..4f97b1271 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotspec.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotvector.java
index 658a1cbda..89389dea6 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotvector.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Mapdesc.java
index 568eddc51..8fab114ff 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Mapdesc.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Maplist.java
index b23a1f665..af8024109 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Maplist.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/NurbsConsts.java
index ee7f3b31b..55a176db8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/NurbsConsts.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_curve.java
index 900f8e56f..d6b565433 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_curve.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbscurve.java
index 81110813f..05c89ebcf 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbscurve.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbssurface.java
index b598f525d..867f43657 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbssurface.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_pwlcurve.java
index e50f41d81..27ca3501d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_pwlcurve.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_surface.java
index 76ac79f0a..96d455bca 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_surface.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_trim.java
index 17e5002df..4cbec01be 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_trim.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patch.java
index d3066cc84..51c43fca7 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patch.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patchlist.java
index 8b439a02f..f60a0cc43 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patchlist.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Property.java
index b486a0ead..25b4dc441 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Property.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Pspec.java
index 1e60ed335..0289b274c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Pspec.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/PwlArc.java
index 0c9eca91e..bcbd20a16 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/PwlArc.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quilt.java
index 03e809d23..6d732a44f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quilt.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quiltspec.java
index 6c8e55e06..eaec1c9a2 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quiltspec.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt b/src/jogl/classes/jogamp/opengl/glu/nurbs/README.txt
index 89630c71e..89630c71e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/README.txt
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Renderhints.java
index d1a23fbab..4729e2421 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Renderhints.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Splinespec.java
index 487b47f2d..f1c779c2f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Splinespec.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Subdivider.java
index 99c1b740b..3378dba8d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Subdivider.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/SurfaceEvaluator.java
index fe23f9c08..35ad1b7e7 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/SurfaceEvaluator.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/TrimVertex.java
index 6608f8f40..e88d69709 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java
+++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/TrimVertex.java
@@ -1,4 +1,4 @@
-package com.jogamp.opengl.impl.glu.nurbs;
+package jogamp.opengl.glu.nurbs;
 
 /*
  ** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java b/src/jogl/classes/jogamp/opengl/glu/registry/Registry.java
index 21b15f4d4..3d669d9bb 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java
+++ b/src/jogl/classes/jogamp/opengl/glu/registry/Registry.java
@@ -42,7 +42,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package com.jogamp.opengl.impl.glu.registry;
+package jogamp.opengl.glu.registry;
 
 import javax.media.opengl.glu.GLU;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/ActiveRegion.java
index 85397dd6a..13c226a7c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/ActiveRegion.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 
 class ActiveRegion {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/CachedVertex.java
index 8948acfec..91072e310 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/CachedVertex.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class CachedVertex {
     public double[] coords = new double[3];
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Dict.java
index d26948e7f..3ac9df67a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Dict.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class Dict {
     DictNode head;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/DictNode.java
index 8864de127..93cf2314f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/DictNode.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class DictNode {
     Object key;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUface.java
index 2ff4aae59..b15bf7195 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUface.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class GLUface {
     public GLUface next;		/* next face (never NULL) */
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUhalfEdge.java
index c2128b616..385a4384b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUhalfEdge.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class GLUhalfEdge {
     public GLUhalfEdge next;		/* doubly-linked list (prev==Sym->next) */
@@ -58,10 +58,10 @@ class GLUhalfEdge {
     public GLUhalfEdge Onext;		/* next edge CCW around origin */
     public GLUhalfEdge Lnext;		/* next edge CCW around left face */
     public GLUvertex Org;		/* origin vertex (Overtex too long) */
-    public com.jogamp.opengl.impl.glu.tessellator.GLUface Lface;		/* left face */
+    public jogamp.opengl.glu.tessellator.GLUface Lface;		/* left face */
 
     /* Internal data (keep hidden) */
-    public com.jogamp.opengl.impl.glu.tessellator.ActiveRegion activeRegion;	/* a region with this upper edge (sweep.c) */
+    public jogamp.opengl.glu.tessellator.ActiveRegion activeRegion;	/* a region with this upper edge (sweep.c) */
     public int winding;	/* change in winding number when crossing */
     public boolean first;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUmesh.java
index 493eb20f4..dfdf5be70 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUmesh.java
@@ -50,11 +50,11 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class GLUmesh {
     GLUvertex vHead = new GLUvertex();		/* dummy header for vertex list */
-    com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = new GLUface();		/* dummy header for face list */
-    com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true);		/* dummy header for edge list */
-    com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false);	/* and its symmetric counterpart */
+    jogamp.opengl.glu.tessellator.GLUface fHead = new GLUface();		/* dummy header for face list */
+    jogamp.opengl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true);		/* dummy header for edge list */
+    jogamp.opengl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false);	/* and its symmetric counterpart */
 }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUtessellatorImpl.java
index b21998355..182820bbc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUtessellatorImpl.java
@@ -50,9 +50,9 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
-import com.jogamp.opengl.impl.glu.tessellator.*;
+import jogamp.opengl.glu.tessellator.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUvertex.java
index af294caad..c30d75946 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUvertex.java
@@ -50,12 +50,12 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class GLUvertex {
     public GLUvertex next;		/* next vertex (never NULL) */
     public GLUvertex prev;		/* previous vertex (never NULL) */
-    public com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge anEdge;	/* a half-edge with this origin */
+    public jogamp.opengl.glu.tessellator.GLUhalfEdge anEdge;	/* a half-edge with this origin */
     public Object data;		/* client's data */
 
     /* Internal data (keep hidden) */
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Geom.java
index 2710346d1..3da2d267e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Geom.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class Geom {
     private Geom() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Mesh.java
index b8be9f80f..942dfe8d1 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Mesh.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class Mesh {
     private Mesh() {
@@ -61,19 +61,19 @@ class Mesh {
  * No vertex or face structures are allocated, but these must be assigned
  * before the current edge operation is completed.
  */
-    static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge MakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNext) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev;
+    static jogamp.opengl.glu.tessellator.GLUhalfEdge MakeEdge(jogamp.opengl.glu.tessellator.GLUhalfEdge eNext) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eSym;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge ePrev;
 
 //        EdgePair * pair = (EdgePair *)
 //        memAlloc(sizeof(EdgePair));
 //        if (pair == NULL) return NULL;
 //
 //        e = &pair - > e;
-        e = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(true);
+        e = new jogamp.opengl.glu.tessellator.GLUhalfEdge(true);
 //        eSym = &pair - > eSym;
-        eSym = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(false);
+        eSym = new jogamp.opengl.glu.tessellator.GLUhalfEdge(false);
 
 
         /* Make sure eNext points to the first edge of the edge pair */
@@ -115,9 +115,9 @@ class Mesh {
  * depending on whether a and b belong to different face or vertex rings.
  * For more explanation see __gl_meshSplice() below.
  */
-    static void Splice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge a, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge b) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge aOnext = a.Onext;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge bOnext = b.Onext;
+    static void Splice(jogamp.opengl.glu.tessellator.GLUhalfEdge a, jogamp.opengl.glu.tessellator.GLUhalfEdge b) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge aOnext = a.Onext;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge bOnext = b.Onext;
 
         aOnext.Sym.Lnext = b;
         bOnext.Sym.Lnext = a;
@@ -131,11 +131,11 @@ class Mesh {
  * the new vertex *before* vNext so that algorithms which walk the vertex
  * list will not see the newly created vertices.
  */
-    static void MakeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex,
-                           com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNext) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNew = newVertex;
+    static void MakeVertex(jogamp.opengl.glu.tessellator.GLUvertex newVertex,
+                           jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig, jogamp.opengl.glu.tessellator.GLUvertex vNext) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
+        jogamp.opengl.glu.tessellator.GLUvertex vPrev;
+        jogamp.opengl.glu.tessellator.GLUvertex vNew = newVertex;
 
         assert (vNew != null);
 
@@ -164,10 +164,10 @@ class Mesh {
  * the new face *before* fNext so that algorithms which walk the face
  * list will not see the newly created faces.
  */
-    static void MakeFace(com.jogamp.opengl.impl.glu.tessellator.GLUface newFace, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUface fNext) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface fNew = newFace;
+    static void MakeFace(jogamp.opengl.glu.tessellator.GLUface newFace, jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig, jogamp.opengl.glu.tessellator.GLUface fNext) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
+        jogamp.opengl.glu.tessellator.GLUface fPrev;
+        jogamp.opengl.glu.tessellator.GLUface fNew = newFace;
 
         assert (fNew != null);
 
@@ -199,8 +199,8 @@ class Mesh {
 /* KillEdge( eDel ) destroys an edge (the half-edges eDel and eDel->Sym),
  * and removes from the global edge list.
  */
-    static void KillEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev, eNext;
+    static void KillEdge(jogamp.opengl.glu.tessellator.GLUhalfEdge eDel) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge ePrev, eNext;
 
         /* Half-edges are allocated in pairs, see EdgePair above */
         if (!eDel.first) {
@@ -218,9 +218,9 @@ class Mesh {
 /* KillVertex( vDel ) destroys a vertex and removes it from the global
  * vertex list.  It updates the vertex loop to point to a given new vertex.
  */
-    static void KillVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex vDel, com.jogamp.opengl.impl.glu.tessellator.GLUvertex newOrg) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev, vNext;
+    static void KillVertex(jogamp.opengl.glu.tessellator.GLUvertex vDel, jogamp.opengl.glu.tessellator.GLUvertex newOrg) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge;
+        jogamp.opengl.glu.tessellator.GLUvertex vPrev, vNext;
 
         /* change the origin of all affected edges */
         e = eStart;
@@ -239,9 +239,9 @@ class Mesh {
 /* KillFace( fDel ) destroys a face and removes it from the global face
  * list.  It updates the face loop to point to a given new face.
  */
-    static void KillFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fDel, com.jogamp.opengl.impl.glu.tessellator.GLUface newLface) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
+    static void KillFace(jogamp.opengl.glu.tessellator.GLUface fDel, jogamp.opengl.glu.tessellator.GLUface newLface) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge;
+        jogamp.opengl.glu.tessellator.GLUface fPrev, fNext;
 
         /* change the left face of all affected edges */
         e = eStart;
@@ -263,11 +263,11 @@ class Mesh {
 /* __gl_meshMakeEdge creates one edge, two vertices, and a loop (face).
  * The loop consists of the two new half-edges.
  */
-    public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex1 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex2 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
-        com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+    public static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(jogamp.opengl.glu.tessellator.GLUmesh mesh) {
+        jogamp.opengl.glu.tessellator.GLUvertex newVertex1 = new jogamp.opengl.glu.tessellator.GLUvertex();
+        jogamp.opengl.glu.tessellator.GLUvertex newVertex2 = new jogamp.opengl.glu.tessellator.GLUvertex();
+        jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface();
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
 
         e = MakeEdge(mesh.eHead);
         if (e == null) return null;
@@ -302,7 +302,7 @@ class Mesh {
  * If eDst == eOrg->Onext, the new vertex will have a single edge.
  * If eDst == eOrg->Oprev, the old vertex will have a single edge.
  */
-    public static boolean __gl_meshSplice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
+    public static boolean __gl_meshSplice(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg, jogamp.opengl.glu.tessellator.GLUhalfEdge eDst) {
         boolean joiningLoops = false;
         boolean joiningVertices = false;
 
@@ -323,7 +323,7 @@ class Mesh {
         Splice(eDst, eOrg);
 
         if (!joiningVertices) {
-            com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+            jogamp.opengl.glu.tessellator.GLUvertex newVertex = new jogamp.opengl.glu.tessellator.GLUvertex();
 
             /* We split one vertex into two -- the new vertex is eDst.Org.
              * Make sure the old vertex points to a valid half-edge.
@@ -332,7 +332,7 @@ class Mesh {
             eOrg.Org.anEdge = eOrg;
         }
         if (!joiningLoops) {
-            com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+            jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface();
 
             /* We split one loop into two -- the new loop is eDst.Lface.
              * Make sure the old face points to a valid half-edge.
@@ -355,8 +355,8 @@ class Mesh {
  * plus a few calls to memFree, but this would allocate and delete
  * unnecessary vertices and faces.
  */
-    static boolean __gl_meshDelete(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym;
+    static boolean __gl_meshDelete(jogamp.opengl.glu.tessellator.GLUhalfEdge eDel) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym;
         boolean joiningLoops = false;
 
         /* First step: disconnect the origin vertex eDel.Org.  We make all
@@ -377,7 +377,7 @@ class Mesh {
 
             Splice(eDel, eDel.Sym.Lnext);
             if (!joiningLoops) {
-                com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+                jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface();
 
                 /* We are splitting one loop into two -- create a new loop for eDel. */
                 MakeFace(newFace, eDel, eDel.Lface);
@@ -415,9 +415,9 @@ class Mesh {
  * eNew == eOrg.Lnext, and eNew.Dst is a newly created vertex.
  * eOrg and eNew will have the same left face.
  */
-    static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
+    static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eNewSym;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
 
         eNewSym = eNew.Sym;
 
@@ -427,7 +427,7 @@ class Mesh {
         /* Set the vertex and face information */
         eNew.Org = eOrg.Sym.Org;
         {
-            com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+            jogamp.opengl.glu.tessellator.GLUvertex newVertex = new jogamp.opengl.glu.tessellator.GLUvertex();
 
             MakeVertex(newVertex, eNewSym, eNew.Org);
         }
@@ -441,9 +441,9 @@ class Mesh {
  * such that eNew == eOrg.Lnext.  The new vertex is eOrg.Sym.Org == eNew.Org.
  * eOrg and eNew will have the same left face.
  */
-    public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
+    public static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eNew;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
 
         eNew = tempHalfEdge.Sym;
 
@@ -472,10 +472,10 @@ class Mesh {
  * If (eOrg.Lnext == eDst), the old face is reduced to a single edge.
  * If (eOrg.Lnext.Lnext == eDst), the old face is reduced to two edges.
  */
-    static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshConnect(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
+    static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshConnect(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg, jogamp.opengl.glu.tessellator.GLUhalfEdge eDst) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eNewSym;
         boolean joiningLoops = false;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
 
         eNewSym = eNew.Sym;
 
@@ -498,7 +498,7 @@ class Mesh {
         eOrg.Lface.anEdge = eNewSym;
 
         if (!joiningLoops) {
-            com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+            jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface();
 
             /* We split one loop into two -- the new loop is eNew.Lface */
             MakeFace(newFace, eNew, eOrg.Lface);
@@ -516,10 +516,10 @@ class Mesh {
  * An entire mesh can be deleted by zapping its faces, one at a time,
  * in any order.  Zapped faces cannot be used in further mesh operations!
  */
-    static void __gl_meshZapFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fZap) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext, eSym;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
+    static void __gl_meshZapFace(jogamp.opengl.glu.tessellator.GLUface fZap) {
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e, eNext, eSym;
+        jogamp.opengl.glu.tessellator.GLUface fPrev, fNext;
 
         /* walk around face, deleting edges whose right face is also null */
         eNext = eStart.Lnext;
@@ -561,12 +561,12 @@ class Mesh {
 /* __gl_meshNewMesh() creates a new mesh with no edges, no vertices,
  * and no loops (what we usually call a "face").
  */
-    public static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshNewMesh() {
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
-        com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh = new com.jogamp.opengl.impl.glu.tessellator.GLUmesh();
+    public static jogamp.opengl.glu.tessellator.GLUmesh __gl_meshNewMesh() {
+        jogamp.opengl.glu.tessellator.GLUvertex v;
+        jogamp.opengl.glu.tessellator.GLUface f;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eSym;
+        jogamp.opengl.glu.tessellator.GLUmesh mesh = new jogamp.opengl.glu.tessellator.GLUmesh();
 
         v = mesh.vHead;
         f = mesh.fHead;
@@ -609,13 +609,13 @@ class Mesh {
 /* __gl_meshUnion( mesh1, mesh2 ) forms the union of all structures in
  * both meshes, and returns the new mesh (the old meshes are destroyed).
  */
-    static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshUnion(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh1, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh2) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f1 = mesh1.fHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v1 = mesh1.vHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f2 = mesh2.fHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v2 = mesh2.vHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead;
+    static jogamp.opengl.glu.tessellator.GLUmesh __gl_meshUnion(jogamp.opengl.glu.tessellator.GLUmesh mesh1, jogamp.opengl.glu.tessellator.GLUmesh mesh2) {
+        jogamp.opengl.glu.tessellator.GLUface f1 = mesh1.fHead;
+        jogamp.opengl.glu.tessellator.GLUvertex v1 = mesh1.vHead;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead;
+        jogamp.opengl.glu.tessellator.GLUface f2 = mesh2.fHead;
+        jogamp.opengl.glu.tessellator.GLUvertex v2 = mesh2.vHead;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead;
 
         /* Add the faces, vertices, and edges of mesh2 to those of mesh1 */
         if (f2.next != f2) {
@@ -645,8 +645,8 @@ class Mesh {
 
 /* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
  */
-    static void __gl_meshDeleteMeshZap(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
+    static void __gl_meshDeleteMeshZap(jogamp.opengl.glu.tessellator.GLUmesh mesh) {
+        jogamp.opengl.glu.tessellator.GLUface fHead = mesh.fHead;
 
         while (fHead.next != fHead) {
             __gl_meshZapFace(fHead.next);
@@ -656,10 +656,10 @@ class Mesh {
 
 /* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
  */
-    public static void __gl_meshDeleteMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f, fNext;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vNext;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext;
+    public static void __gl_meshDeleteMesh(jogamp.opengl.glu.tessellator.GLUmesh mesh) {
+        jogamp.opengl.glu.tessellator.GLUface f, fNext;
+        jogamp.opengl.glu.tessellator.GLUvertex v, vNext;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e, eNext;
 
         for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) {
             fNext = f.next;
@@ -677,13 +677,13 @@ class Mesh {
 
 /* __gl_meshCheckMesh( mesh ) checks a mesh for self-consistency.
  */
-    public static void __gl_meshCheckMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = mesh.vHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f, fPrev;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vPrev;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, ePrev;
+    public static void __gl_meshCheckMesh(jogamp.opengl.glu.tessellator.GLUmesh mesh) {
+        jogamp.opengl.glu.tessellator.GLUface fHead = mesh.fHead;
+        jogamp.opengl.glu.tessellator.GLUvertex vHead = mesh.vHead;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead;
+        jogamp.opengl.glu.tessellator.GLUface f, fPrev;
+        jogamp.opengl.glu.tessellator.GLUvertex v, vPrev;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e, ePrev;
 
         fPrev = fHead;
         for (fPrev = fHead; (f = fPrev.next) != fHead; fPrev = f) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Normal.java
index fe1a20c49..7d5acd9f8 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Normal.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
@@ -110,17 +110,17 @@ class Normal {
     }
 
     static void ComputeNormal(GLUtessellatorImpl tess, double[] norm) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, v1, v2;
+        jogamp.opengl.glu.tessellator.GLUvertex v, v1, v2;
         double c, tLen2, maxLen2;
         double[] maxVal, minVal, d1, d2, tNorm;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex[] maxVert, minVert;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead;
+        jogamp.opengl.glu.tessellator.GLUvertex[] maxVert, minVert;
+        jogamp.opengl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead;
         int i;
 
         maxVal = new double[3];
         minVal = new double[3];
-        minVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3];
-        maxVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3];
+        minVert = new jogamp.opengl.glu.tessellator.GLUvertex[3];
+        maxVert = new jogamp.opengl.glu.tessellator.GLUvertex[3];
         d1 = new double[3];
         d2 = new double[3];
         tNorm = new double[3];
@@ -194,9 +194,9 @@ class Normal {
 
     static void CheckOrientation(GLUtessellatorImpl tess) {
         double area;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        jogamp.opengl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead;
+        jogamp.opengl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
 
 /* When we compute the normal automatically, we choose the orientation
  * so that the the sum of the signed areas of all contours is non-negative.
@@ -225,7 +225,7 @@ class Normal {
  * of the polygon.
  */
     public static void __gl_projectPolygon(GLUtessellatorImpl tess) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
+        jogamp.opengl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
         double w;
         double[] norm = new double[3];
         double[] sUnit, tUnit;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQ.java
index b77305ae2..25405ad64 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQ.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 abstract class PriorityQ {
     public static final int INIT_SIZE = 32;
@@ -76,7 +76,7 @@ abstract class PriorityQ {
 /* Violates modularity, but a little faster */
 //    #include "geom.h"
     public static boolean LEQ(Leq leq, Object x, Object y) {
-        return com.jogamp.opengl.impl.glu.tessellator.Geom.VertLeq((com.jogamp.opengl.impl.glu.tessellator.GLUvertex) x, (com.jogamp.opengl.impl.glu.tessellator.GLUvertex) y);
+        return jogamp.opengl.glu.tessellator.Geom.VertLeq((jogamp.opengl.glu.tessellator.GLUvertex) x, (jogamp.opengl.glu.tessellator.GLUvertex) y);
     }
 
     static PriorityQ pqNewPriorityQ(Leq leq) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQHeap.java
index 61aa9574f..899df2e3d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQHeap.java
@@ -50,25 +50,25 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
-class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
-    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] nodes;
-    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] handles;
+class PriorityQHeap extends jogamp.opengl.glu.tessellator.PriorityQ {
+    jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] nodes;
+    jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] handles;
     int size, max;
     int freeList;
     boolean initialized;
-    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
+    jogamp.opengl.glu.tessellator.PriorityQ.Leq leq;
 
 /* really __gl_pqHeapNewPriorityQ */
-    public PriorityQHeap(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
+    public PriorityQHeap(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq) {
         size = 0;
-        max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
-        nodes = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
+        max = jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE;
+        nodes = new jogamp.opengl.glu.tessellator.PriorityQ.PQnode[jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
         for (int i = 0; i < nodes.length; i++) {
             nodes[i] = new PQnode();
         }
-        handles = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
+        handles = new jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
         for (int i = 0; i < handles.length; i++) {
             handles[i] = new PQhandleElem();
         }
@@ -87,8 +87,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
     }
 
     void FloatDown(int curr) {
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
         int hCurr, hChild;
         int child;
 
@@ -116,8 +116,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
 
 
     void FloatUp(int curr) {
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
         int hCurr, hParent;
         int parent;
 
@@ -158,8 +158,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
 
         curr = ++size;
         if ((curr * 2) > max) {
-            com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes;
-            com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles;
+            jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes;
+            jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles;
 
             /* If the heap overflows, double its size. */
             max <<= 1;
@@ -208,8 +208,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
 
 /* really __gl_pqHeapExtractMin */
     Object pqExtractMin() {
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
         int hMin = n[1].handle;
         Object min = h[hMin].key;
 
@@ -230,8 +230,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
 
 /* really __gl_pqHeapDelete */
     void pqDelete(int hCurr) {
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
-        com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+        jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
         int curr;
 
         assert (hCurr >= 1 && hCurr <= max && h[hCurr].key != null);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQSort.java
index f115b8f49..f37f98ace 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQSort.java
@@ -45,10 +45,10 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
-class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
-    com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap heap;
+class PriorityQSort extends jogamp.opengl.glu.tessellator.PriorityQ {
+    jogamp.opengl.glu.tessellator.PriorityQHeap heap;
     Object[] keys;
 
     // JAVA: 'order' contains indices into the keys array.
@@ -57,15 +57,15 @@ class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
     int[] order;
     int size, max;
     boolean initialized;
-    com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
+    jogamp.opengl.glu.tessellator.PriorityQ.Leq leq;
 
-    public PriorityQSort(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
-        heap = new com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap(leq);
+    public PriorityQSort(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq) {
+        heap = new jogamp.opengl.glu.tessellator.PriorityQHeap(leq);
 
-        keys = new Object[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE];
+        keys = new Object[jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE];
 
         size = 0;
-        max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
+        max = jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE;
         initialized = false;
         this.leq = leq;
     }
@@ -77,12 +77,12 @@ class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
         keys = null;
     }
 
-    private static boolean LT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
-        return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x));
+    private static boolean LT(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
+        return (!jogamp.opengl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x));
     }
 
-    private static boolean GT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
-        return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y));
+    private static boolean GT(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
+        return (!jogamp.opengl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y));
     }
 
     private static void Swap(int[] array, int a, int b) {
@@ -249,7 +249,7 @@ class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
         sortMin = keys[order[size - 1]];
         if (!heap.pqIsEmpty()) {
             heapMin = heap.pqMinimum();
-            if (com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
+            if (jogamp.opengl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
                 return heapMin;
             }
         }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Render.java
index 9761200e0..34b7ee55b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Render.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
@@ -73,19 +73,19 @@ class Render {
         public FaceCount() {
         }
 
-        public FaceCount(long size, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) {
+        public FaceCount(long size, jogamp.opengl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) {
             this.size = size;
             this.eStart = eStart;
             this.render = render;
         }
 
         long size;		/* number of triangles used */
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart;	/* edge where this primitive starts */
+        jogamp.opengl.glu.tessellator.GLUhalfEdge eStart;	/* edge where this primitive starts */
         renderCallBack render;
     };
 
     private static interface renderCallBack {
-        void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size);
+        void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size);
     }
 
     /************************ Strips and Fans decomposition ******************/
@@ -97,8 +97,8 @@ class Render {
  *
  * The rendering output is provided as callbacks (see the api).
  */
-    public static void __gl_renderMesh(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f;
+    public static void __gl_renderMesh(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUmesh mesh) {
+        jogamp.opengl.glu.tessellator.GLUface f;
 
         /* Make a list of separate triangles so we can render them all at once */
         tess.lonelyTriList = null;
@@ -124,7 +124,7 @@ class Render {
     }
 
 
-    static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface fOrig) {
+    static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUface fOrig) {
         /* We want to find the largest triangle fan or strip of unmarked faces
          * which includes the given face fOrig.  There are 3 possible fans
          * passing through fOrig (one centered at each vertex), and 3 possible
@@ -132,7 +132,7 @@ class Render {
          * is to try all of these, and take the primitive which uses the most
          * triangles (a greedy approach).
          */
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge;
         FaceCount max = new FaceCount();
         FaceCount newFace = new FaceCount();
 
@@ -178,17 +178,17 @@ class Render {
  * more complicated, and we need a general tracking method like the
  * one here.
  */
-    private static boolean Marked(com.jogamp.opengl.impl.glu.tessellator.GLUface f) {
+    private static boolean Marked(jogamp.opengl.glu.tessellator.GLUface f) {
         return !f.inside || f.marked;
     }
 
-    private static GLUface AddToTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface f, com.jogamp.opengl.impl.glu.tessellator.GLUface t) {
+    private static GLUface AddToTrail(jogamp.opengl.glu.tessellator.GLUface f, jogamp.opengl.glu.tessellator.GLUface t) {
         f.trail = t;
         f.marked = true;
         return f;
     }
 
-    private static void FreeTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface t) {
+    private static void FreeTrail(jogamp.opengl.glu.tessellator.GLUface t) {
         if (true) {
             while (t != null) {
                 t.marked = false;
@@ -199,14 +199,14 @@ class Render {
         }
     }
 
-    static FaceCount MaximumFan(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
+    static FaceCount MaximumFan(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig) {
         /* eOrig.Lface is the face we want to render.  We want to find the size
          * of a maximal fan around eOrig.Org.  To do this we just walk around
          * the origin vertex as far as possible in both directions.
          */
         FaceCount newFace = new FaceCount(0, null, renderFan);
-        com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        jogamp.opengl.glu.tessellator.GLUface trail = null;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
 
         for (e = eOrig; !Marked(e.Lface); e = e.Onext) {
             trail = AddToTrail(e.Lface, trail);
@@ -227,7 +227,7 @@ class Render {
         return (n & 0x1L) == 0;
     }
 
-    static FaceCount MaximumStrip(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
+    static FaceCount MaximumStrip(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig) {
         /* Here we are looking for a maximal strip that contains the vertices
          * eOrig.Org, eOrig.Dst, eOrig.Lnext.Dst (in that order or the
          * reverse, such that all triangles are oriented CCW).
@@ -240,8 +240,8 @@ class Render {
          */
         FaceCount newFace = new FaceCount(0, null, renderStrip);
         long headSize = 0, tailSize = 0;
-        com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eTail, eHead;
+        jogamp.opengl.glu.tessellator.GLUface trail = null;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e, eTail, eHead;
 
         for (e = eOrig; !Marked(e.Lface); ++tailSize, e = e.Onext) {
             trail = AddToTrail(e.Lface, trail);
@@ -279,7 +279,7 @@ class Render {
     }
 
     private static class RenderTriangle implements renderCallBack {
-        public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+        public void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size) {
             /* Just add the triangle to a triangle list, so we can render all
              * the separate triangles at once.
              */
@@ -289,11 +289,11 @@ class Render {
     }
 
 
-    static void RenderLonelyTriangles(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface f) {
+    static void RenderLonelyTriangles(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUface f) {
         /* Now we render all the separate triangles which could not be
          * grouped into a triangle fan or strip.
          */
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
         int newState;
         int edgeState = -1;	/* force edge state output for first vertex */
 
@@ -323,7 +323,7 @@ class Render {
     }
 
     private static class RenderFan implements renderCallBack {
-        public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+        public void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size) {
             /* Render as many CCW triangles as possible in a fan starting from
              * edge "e".  The fan *should* contain exactly "size" triangles
              * (otherwise we've goofed up somewhere).
@@ -345,7 +345,7 @@ class Render {
     }
 
     private static class RenderStrip implements renderCallBack {
-        public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+        public void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size) {
             /* Render as many CCW triangles as possible in a strip starting from
              * edge "e".  The strip *should* contain exactly "size" triangles
              * (otherwise we've goofed up somewhere).
@@ -378,9 +378,9 @@ class Render {
  * contour for each face marked "inside".  The rendering output is
  * provided as callbacks (see the api).
  */
-    public static void __gl_renderBoundary(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
-        com.jogamp.opengl.impl.glu.tessellator.GLUface f;
-        com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+    public static void __gl_renderBoundary(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUmesh mesh) {
+        jogamp.opengl.glu.tessellator.GLUface f;
+        jogamp.opengl.glu.tessellator.GLUhalfEdge e;
 
         for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
             if (f.inside) {
@@ -409,7 +409,7 @@ class Render {
  * are degenerate return 0; otherwise (no consistent orientation) return
  * SIGN_INCONSISTENT.
  */ {
-        com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
+        jogamp.opengl.glu.tessellator.CachedVertex[] v = tess.cache;
 //            CachedVertex vn = v0 + tess.cacheCount;
         int vn = tess.cacheCount;
 //            CachedVertex vc;
@@ -488,7 +488,7 @@ class Render {
  * output is provided as callbacks (see the api).
  */
     public static boolean __gl_renderCache(GLUtessellatorImpl tess) {
-        com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
+        jogamp.opengl.glu.tessellator.CachedVertex[] v = tess.cache;
 //            CachedVertex vn = v0 + tess.cacheCount;
         int vn = tess.cacheCount;
 //            CachedVertex vc;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java
index 8ffeadb67..95eb5dda1 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessMono.java
index ef89b1613..5db543c80 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessMono.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class TessMono {
 /* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessState.java
index a8aa41d9f..c25de2d91 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessState.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package com.jogamp.opengl.impl.glu.tessellator;
+package jogamp.opengl.glu.tessellator;
 
 class TessState {
     public static final int T_DORMANT = 0;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
index 3450c456e..085889739 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
@@ -38,13 +38,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import java.nio.*;
 import java.util.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawable.java
index 1eeaa55e1..10e061d3a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawable.java
@@ -38,11 +38,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
   // The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
index 421bae715..19f3ce640 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import java.nio.*;
 import java.util.HashMap;
@@ -50,8 +50,8 @@ import javax.media.opengl.*;
 
 import com.jogamp.common.JogampRuntimeException;
 import com.jogamp.common.util.*;
-import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.ProxySurface;
+import jogamp.opengl.*;
+import jogamp.nativewindow.ProxySurface;
 
 public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
   private static final DesktopGLDynamicLookupHelper macOSXCGLDynamicLookupHelper;
@@ -84,7 +84,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
     new MacOSXCGLGraphicsConfigurationFactory();
     if(GLProfile.isAWTAvailable()) {
         try {
-          ReflectionUtil.createInstance("com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
+          ReflectionUtil.createInstance("jogamp.opengl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
                                         null, getClass().getClassLoader());
         } catch (JogampRuntimeException jre) { /* n/a .. */ }
     }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java
index a9b1a5977..94d790cee 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java
@@ -26,9 +26,9 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.common.os.DynamicLookupHelper;
 import com.jogamp.common.os.NativeLibrary;
 import com.jogamp.common.os.Platform;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
index c41b700dc..0d73b6b9c 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
@@ -34,7 +34,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
index cc06a6775..d4526f04e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
@@ -31,9 +31,9 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
-import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory;
+import jogamp.opengl.GLGraphicsConfigurationFactory;
 import javax.media.nativewindow.AbstractGraphicsConfiguration;
 import javax.media.nativewindow.AbstractGraphicsScreen;
 import javax.media.nativewindow.CapabilitiesChooser;
@@ -49,7 +49,7 @@ import javax.media.opengl.GLCapabilitiesImmutable;
     GraphicsDevice and GraphicsConfiguration abstractions. */
 
 public class MacOSXCGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+    protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration");
 
     MacOSXCGLGraphicsConfigurationFactory() {
         GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.macosx.MacOSXGraphicsDevice.class, this);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java
index 80a396a29..e0ee8ea73 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java
@@ -38,13 +38,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 import javax.media.nativewindow.*;
-import com.jogamp.nativewindow.impl.ProxySurface;
+import jogamp.nativewindow.ProxySurface;
 
 public class MacOSXExternalCGLContext extends MacOSXCGLContext {
   private boolean firstMakeCurrent = true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLContext.java
index 89e293665..6dba11038 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class MacOSXOffscreenCGLContext extends MacOSXPbufferCGLContext
 {  
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
index f87c89f2d..bec4cf32a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
@@ -38,11 +38,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class MacOSXOffscreenCGLDrawable extends MacOSXPbufferCGLDrawable {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java
index e494fd121..c839c87f1 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java
@@ -37,13 +37,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import java.util.*;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class MacOSXOnscreenCGLContext extends MacOSXCGLContext {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
index 798e39ef4..bd311217d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import java.lang.ref.WeakReference;
 import java.security.*;
@@ -46,7 +46,7 @@ import java.util.*;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class MacOSXOnscreenCGLDrawable extends MacOSXCGLDrawable {
   private List/*<WeakReference<GLContext>>*/ createdContexts =
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLContext.java
index 93e5767b3..6eda3f068 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -31,7 +31,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import com.jogamp.common.nio.PointerBuffer;
 import java.security.*;
@@ -39,7 +39,7 @@ import java.util.*;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index 37c6cfb70..ec9ff8dd2 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -38,12 +38,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl;
+package jogamp.opengl.macosx.cgl;
 
 import com.jogamp.common.nio.PointerBuffer;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
   private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
index 4a80990cb..fe60710f0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
@@ -37,11 +37,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl.awt;
+package jogamp.opengl.macosx.cgl.awt;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.macosx.cgl.*;
+import jogamp.opengl.macosx.cgl.*;
 
 public class MacOSXAWTCGLDrawableFactory extends MacOSXCGLDrawableFactory {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
index 95b6f473f..68e82dc19 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
@@ -31,9 +31,9 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl.awt;
+package jogamp.opengl.macosx.cgl.awt;
 
-import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory;
+import jogamp.opengl.GLGraphicsConfigurationFactory;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 
@@ -53,10 +53,10 @@ import javax.media.opengl.GLCapabilitiesChooser;
 import javax.media.opengl.GLCapabilitiesImmutable;
 import javax.media.opengl.GLException;
 
-import com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLGraphicsConfiguration;
+import jogamp.opengl.macosx.cgl.MacOSXCGLGraphicsConfiguration;
 
 public class MacOSXAWTCGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+    protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration");
 
     public MacOSXAWTCGLGraphicsConfigurationFactory() {
         GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
index f19fbcf6b..c5372bb5e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
@@ -37,15 +37,15 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.macosx.cgl.awt;
+package jogamp.opengl.macosx.cgl.awt;
 
-import com.jogamp.opengl.impl.macosx.cgl.*;
+import jogamp.opengl.macosx.cgl.*;
 
 import java.awt.Graphics;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
-import com.jogamp.opengl.impl.awt.*;
-import com.jogamp.opengl.impl.macosx.cgl.*;
+import jogamp.opengl.*;
+import jogamp.opengl.awt.*;
+import jogamp.opengl.macosx.cgl.*;
 
 /** MacOSXCGLContext implementation supporting the Java2D/JOGL bridge
  * on Mac OS X. The external GLDrawable mechanism does not work on Mac
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java
index b8e3922a4..4e5afc683 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java
@@ -2,7 +2,7 @@
  * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
  */
 
-package com.jogamp.opengl.util.glsl.fixedfunc.impl;
+package jogamp.opengl.util.glsl.fixedfunc;
 
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
index 529e4567b..b77cf4617 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
@@ -1,5 +1,5 @@
 
-package com.jogamp.opengl.util.glsl.fixedfunc.impl;
+package jogamp.opengl.util.glsl.fixedfunc;
 
 import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColor.fp
index 408ff7251..408ff7251 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColor.fp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColor.vp
index 346e40196..346e40196 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColor.vp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorLight.vp
index ce203cfb9..ce203cfb9 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorLight.vp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp
index 86e6ace73..86e6ace73 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColor.bfp
index 3ebaaee1d..3ebaaee1d 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColor.bfp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColor.bvp
index 279ef72c7..279ef72c7 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColor.bvp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColorLight.bvp
index 5a9deea71..5a9deea71 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColorLight.bvp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColorTexture.bfp
index ce1397fe1..ce1397fe1 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/bin/nvidia/FixedFuncColorTexture.bfp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/es_precision.glsl
index fd6abe54e..fd6abe54e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/es_precision.glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_attribute.glsl
index b09bdb05a..b09bdb05a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_attribute.glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_const.glsl
index 1a464a1cb..1a464a1cb 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_const.glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_lightdef.glsl
index 98e214139..98e214139 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_lightdef.glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_settexcoord.vp
index 1efe328d0..1efe328d0 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_settexcoord.vp
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_uniform.glsl
index d8b3c7f95..d8b3c7f95 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_uniform.glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_uniform_light.glsl
index 0dedb5d5d..0dedb5d5d 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_uniform_light.glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_varying.glsl
index fc9f735d1..fc9f735d1 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_varying.glsl
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/scripts/nvidia-apx/glslc-ff.bat
index 8a2114e07..8a2114e07 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/scripts/nvidia-apx/glslc-ff.bat
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/scripts/nvidia-apx/glslc.bat
index c7ca0a8b7..c7ca0a8b7 100755
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/scripts/nvidia-apx/glslc.bat
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java
index b5be4bf8d..a23c5a0bc 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WGLGLCapabilities.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java
@@ -26,12 +26,12 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import java.util.Comparator;
 
-import com.jogamp.nativewindow.impl.windows.GDI;
-import com.jogamp.nativewindow.impl.windows.PIXELFORMATDESCRIPTOR;
+import jogamp.nativewindow.windows.GDI;
+import jogamp.nativewindow.windows.PIXELFORMATDESCRIPTOR;
 import javax.media.opengl.GL;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLException;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsBitmapWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLContext.java
index 7b769d971..68b26b30d 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsBitmapWGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLContext.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsBitmapWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
index c61a8d0e4..4df3b7e34 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsBitmapWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import com.jogamp.common.nio.PointerBuffer;
 import javax.media.nativewindow.NativeSurface;
@@ -47,9 +47,9 @@ import javax.media.opengl.GLContext;
 import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLException;
 
-import com.jogamp.nativewindow.impl.windows.BITMAPINFO;
-import com.jogamp.nativewindow.impl.windows.BITMAPINFOHEADER;
-import com.jogamp.nativewindow.impl.windows.GDI;
+import jogamp.nativewindow.windows.BITMAPINFO;
+import jogamp.nativewindow.windows.BITMAPINFOHEADER;
+import jogamp.nativewindow.windows.GDI;
 import javax.media.opengl.GLCapabilitiesImmutable;
 
 public class WindowsBitmapWGLDrawable extends WindowsWGLDrawable {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java
index a307e295d..27d7b342e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java
@@ -38,15 +38,15 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.opengl.GLContext;
 import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLProfile;
 
 import javax.media.nativewindow.AbstractGraphicsScreen;
-import com.jogamp.nativewindow.impl.ProxySurface;
-import com.jogamp.nativewindow.impl.windows.GDI;
+import jogamp.nativewindow.ProxySurface;
+import jogamp.nativewindow.windows.GDI;
 import javax.media.nativewindow.AbstractGraphicsDevice;
 import javax.media.nativewindow.NativeSurface;
 import javax.media.opengl.GLCapabilities;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java
index f07ba3271..569463db5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.nativewindow.AbstractGraphicsScreen;
 import javax.media.nativewindow.DefaultGraphicsScreen;
@@ -49,9 +49,9 @@ import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.nativewindow.impl.ProxySurface;
-import com.jogamp.nativewindow.impl.windows.GDI;
-import com.jogamp.opengl.impl.GLContextShareSet;
+import jogamp.nativewindow.ProxySurface;
+import jogamp.nativewindow.windows.GDI;
+import jogamp.opengl.GLContextShareSet;
 
 
 public class WindowsExternalWGLContext extends WindowsWGLContext {
@@ -65,7 +65,7 @@ public class WindowsExternalWGLContext extends WindowsWGLContext {
       System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(ctx) + " for " + this);
     }
     GLContextShareSet.contextCreated(this);
-    setGLFunctionAvailability(false, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);
+    setGLFunctionAvailability(false, 0, 0, CTX_PROFILE_COMPAT|CTX_OPTION_ANY);  // use GL_VERSION
     getGLStateTracker().setEnabled(false); // external context usage can't track state in Java
   }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLDrawable.java
index 2851473d5..86cc705b5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.nativewindow.AbstractGraphicsScreen;
 import javax.media.nativewindow.DefaultGraphicsScreen;
@@ -49,8 +49,8 @@ import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.nativewindow.impl.ProxySurface;
-import com.jogamp.nativewindow.impl.windows.GDI;
+import jogamp.nativewindow.ProxySurface;
+import jogamp.nativewindow.windows.GDI;
 
 public class WindowsExternalWGLDrawable extends WindowsWGLDrawable {
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLContext.java
index 475faeecc..a06ab8f0e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLContext.java
@@ -37,13 +37,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import java.util.*;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class WindowsOnscreenWGLContext extends WindowsWGLContext {
   public WindowsOnscreenWGLContext(WindowsOnscreenWGLDrawable drawable,
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLDrawable.java
index b0d62a4e1..4f34c946a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLDrawable.java
@@ -38,11 +38,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class WindowsOnscreenWGLDrawable extends WindowsWGLDrawable {
   protected WindowsOnscreenWGLDrawable(GLDrawableFactory factory, NativeSurface component) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLContext.java
index db86b3232..48838de53 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public class WindowsPbufferWGLContext extends WindowsWGLContext {
   // State for render-to-texture and render-to-texture-rectangle support
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
index a8d37796e..7be630187 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.nativewindow.NativeSurface;
 import javax.media.nativewindow.SurfaceChangeable;
@@ -49,7 +49,7 @@ import javax.media.opengl.GLException;
 import javax.media.opengl.GLPbuffer;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.nativewindow.impl.windows.GDI;
+import jogamp.nativewindow.windows.GDI;
 import javax.media.opengl.GLCapabilitiesImmutable;
 
 public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
index 7d38f8ee8..94017e79a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -52,10 +52,10 @@ import javax.media.opengl.GLCapabilitiesImmutable;
 
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver;
-import com.jogamp.nativewindow.impl.windows.GDI;
-import com.jogamp.opengl.impl.GLContextImpl;
-import com.jogamp.opengl.impl.GLContextShareSet;
-import com.jogamp.opengl.impl.GLDrawableImpl;
+import jogamp.nativewindow.windows.GDI;
+import jogamp.opengl.GLContextImpl;
+import jogamp.opengl.GLContextShareSet;
+import jogamp.opengl.GLDrawableImpl;
 
 public class WindowsWGLContext extends GLContextImpl {
   static final Map/*<String, String>*/ functionNameMap;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java
index 83b52fbcb..4ed9a00c3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java
@@ -38,17 +38,17 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import java.security.AccessController;
 import javax.media.nativewindow.NativeSurface;
 import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLException;
 
-import com.jogamp.nativewindow.impl.windows.GDI;
-import com.jogamp.opengl.impl.Debug;
-import com.jogamp.opengl.impl.GLDrawableImpl;
-import com.jogamp.opengl.impl.GLDynamicLookupHelper;
+import jogamp.nativewindow.windows.GDI;
+import jogamp.opengl.Debug;
+import jogamp.opengl.GLDrawableImpl;
+import jogamp.opengl.GLDynamicLookupHelper;
 
 
 public abstract class WindowsWGLDrawable extends GLDrawableImpl {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java
index f44c3c70b..ba3044505 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import java.nio.Buffer;
 import java.nio.ShortBuffer;
@@ -64,15 +64,15 @@ import javax.media.opengl.GLProfile;
 import com.jogamp.common.JogampRuntimeException;
 import com.jogamp.common.nio.PointerBuffer;
 import com.jogamp.common.util.ReflectionUtil;
-import com.jogamp.nativewindow.impl.ProxySurface;
-import com.jogamp.nativewindow.impl.windows.GDI;
-import com.jogamp.nativewindow.impl.windows.RegisteredClassFactory;
-import com.jogamp.opengl.impl.DesktopGLDynamicLookupHelper;
-import com.jogamp.opengl.impl.GLContextImpl;
-import com.jogamp.opengl.impl.GLDrawableFactoryImpl;
-import com.jogamp.opengl.impl.GLDrawableImpl;
-import com.jogamp.opengl.impl.GLDynamicLookupHelper;
-import com.jogamp.opengl.impl.SharedResourceRunner;
+import jogamp.nativewindow.ProxySurface;
+import jogamp.nativewindow.windows.GDI;
+import jogamp.nativewindow.windows.RegisteredClassFactory;
+import jogamp.opengl.DesktopGLDynamicLookupHelper;
+import jogamp.opengl.GLContextImpl;
+import jogamp.opengl.GLDrawableFactoryImpl;
+import jogamp.opengl.GLDrawableImpl;
+import jogamp.opengl.GLDynamicLookupHelper;
+import jogamp.opengl.SharedResourceRunner;
 
 public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl {
   private static final DesktopGLDynamicLookupHelper windowsWGLDynamicLookupHelper;
@@ -104,7 +104,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl {
     new WindowsWGLGraphicsConfigurationFactory();
     if(GLProfile.isAWTAvailable()) {
         try {
-          ReflectionUtil.createInstance("com.jogamp.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
+          ReflectionUtil.createInstance("jogamp.opengl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
                                         null, getClass().getClassLoader());
         } catch (JogampRuntimeException jre) { /* n/a .. */ }
     }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java
index 153680f8e..0fb7f4510 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java
@@ -26,9 +26,9 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import java.util.*;
 
 public class WindowsWGLDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBundleInfo  {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java
index f844bad76..82d170133 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -31,7 +31,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,14 +48,14 @@ import javax.media.opengl.GLException;
 import javax.media.opengl.GLPbuffer;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.nativewindow.impl.windows.GDI;
-import com.jogamp.nativewindow.impl.windows.PIXELFORMATDESCRIPTOR;
-import com.jogamp.opengl.impl.GLContextImpl;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil;
+import jogamp.nativewindow.windows.GDI;
+import jogamp.nativewindow.windows.PIXELFORMATDESCRIPTOR;
+import jogamp.opengl.GLContextImpl;
+import jogamp.opengl.GLGraphicsConfigurationUtil;
 
 public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
     // Keep this under the same debug flag as the drawable factory for convenience
-    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+    protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration");
     
     final static String WGL_ARB_pixel_format = "WGL_ARB_pixel_format";
     final static String WGL_ARB_multisample = "WGL_ARB_multisample";
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 40271d284..7e3de8abb 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -31,7 +31,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.windows.wgl;
+package jogamp.opengl.windows.wgl;
 
 import javax.media.nativewindow.AbstractGraphicsConfiguration;
 import javax.media.nativewindow.AbstractGraphicsDevice;
@@ -48,11 +48,11 @@ import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.nativewindow.impl.windows.GDI;
-import com.jogamp.nativewindow.impl.windows.PIXELFORMATDESCRIPTOR;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil;
-import com.jogamp.opengl.impl.SharedResourceRunner;
+import jogamp.nativewindow.windows.GDI;
+import jogamp.nativewindow.windows.PIXELFORMATDESCRIPTOR;
+import jogamp.opengl.GLGraphicsConfigurationFactory;
+import jogamp.opengl.GLGraphicsConfigurationUtil;
+import jogamp.opengl.SharedResourceRunner;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -64,7 +64,7 @@ import java.util.List;
     GraphicsDevice and GraphicsConfiguration abstractions. */
 
 public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+    protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration");
     static WGLGLCapabilities.PfdIDComparator PfdIDComparator = new WGLGLCapabilities.PfdIDComparator();
 
     WindowsWGLGraphicsConfigurationFactory() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
index f753c08c5..1f09180eb 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
@@ -31,12 +31,12 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.windows.wgl.awt;
+package jogamp.opengl.windows.wgl.awt;
 
 
 import com.jogamp.common.util.ArrayHashSet;
-import com.jogamp.nativewindow.impl.jawt.windows.Win32SunJDKReflection;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory;
+import jogamp.nativewindow.jawt.windows.Win32SunJDKReflection;
+import jogamp.opengl.GLGraphicsConfigurationFactory;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 
@@ -56,11 +56,11 @@ import javax.media.opengl.GLCapabilitiesChooser;
 import javax.media.opengl.GLCapabilitiesImmutable;
 import javax.media.opengl.GLException;
 
-import com.jogamp.opengl.impl.windows.wgl.WindowsWGLGraphicsConfiguration;
+import jogamp.opengl.windows.wgl.WindowsWGLGraphicsConfiguration;
 import javax.media.opengl.GLDrawableFactory;
 
 public class WindowsAWTWGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory {
-    protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
+    protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration");
 
     public WindowsAWTWGLGraphicsConfigurationFactory() {
         GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/jogamp/opengl/x11/glx/GLXUtil.java
index 46bc9460d..e95c80205 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/GLXUtil.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11DummyGLXDrawable.java
index 1f2bf9344..202bba9e7 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11DummyGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11DummyGLXDrawable.java
@@ -26,13 +26,13 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.opengl.*;
 
 import javax.media.nativewindow.x11.*;
-import com.jogamp.nativewindow.impl.*;
-import com.jogamp.nativewindow.impl.x11.*;
+import jogamp.nativewindow.*;
+import jogamp.nativewindow.x11.*;
 
 public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable {
   private static final int f_dim = 64;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXContext.java
index 76f7f6591..769d5f1da 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXContext.java
@@ -38,13 +38,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.ProxySurface;
+import jogamp.opengl.*;
+import jogamp.nativewindow.ProxySurface;
 
 public class X11ExternalGLXContext extends X11GLXContext {
   private boolean firstMakeCurrent = true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXDrawable.java
index f0270fd2a..014992b88 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXDrawable.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
-import com.jogamp.nativewindow.impl.ProxySurface;
+import jogamp.nativewindow.ProxySurface;
 
 
 public class X11ExternalGLXDrawable extends X11GLXDrawable {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLCapabilities.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java
index 3f9d2baae..5455976da 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLCapabilities.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java
@@ -26,9 +26,9 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
-import com.jogamp.nativewindow.impl.x11.XVisualInfo;
+import jogamp.nativewindow.x11.XVisualInfo;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLProfile;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
index dd25f241e..7d7614ca2 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import java.nio.*;
 import java.util.*;
@@ -48,10 +48,10 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.X11GraphicsDevice;
 
 import com.jogamp.common.util.VersionNumber;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
 import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver;
-import com.jogamp.nativewindow.impl.x11.X11Util;
+import jogamp.nativewindow.x11.X11Util;
 
 public abstract class X11GLXContext extends GLContextImpl {
   protected static final boolean TRACE_CONTEXT_CURRENT = false; // true;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java
index 9c3737d3d..d2ce629df 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java
@@ -38,11 +38,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 public abstract class X11GLXDrawable extends GLDrawableImpl {
   protected X11GLXDrawable(GLDrawableFactory factory, NativeSurface comp, boolean realized) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java
index 709e2ddab..44ade1513 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java
@@ -35,7 +35,7 @@
  * facility.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -46,11 +46,11 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.common.JogampRuntimeException;
 import com.jogamp.common.util.*;
-import com.jogamp.nativewindow.impl.ProxySurface;
-import com.jogamp.nativewindow.impl.x11.*;
+import jogamp.nativewindow.ProxySurface;
+import jogamp.nativewindow.x11.*;
 
 public class X11GLXDrawableFactory extends GLDrawableFactoryImpl {
   
@@ -90,7 +90,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl {
     new X11GLXGraphicsConfigurationFactory();
     if(GLProfile.isAWTAvailable()) {
         try {
-          ReflectionUtil.createInstance("com.jogamp.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
+          ReflectionUtil.createInstance("jogamp.opengl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
                                         null, getClass().getClassLoader());
         } catch (JogampRuntimeException jre) { /* n/a .. */ }
     }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java
index d7905aa72..51b6144c5 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java
@@ -26,9 +26,9 @@
  * or implied, of JogAmp Community.
  */
  
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import java.util.*;
 
 public class X11GLXDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBundleInfo  {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java
index f7779ab28..c3d4563ea 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -31,7 +31,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import java.util.ArrayList;
 
@@ -40,8 +40,8 @@ import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
 
 import com.jogamp.common.nio.PointerBuffer;
-import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.x11.*;
+import jogamp.opengl.*;
+import jogamp.nativewindow.x11.*;
 
 public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index b391dc948..319a52c07 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -31,7 +31,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.nativewindow.AbstractGraphicsConfiguration;
 import javax.media.nativewindow.AbstractGraphicsDevice;
@@ -50,12 +50,12 @@ import javax.media.opengl.GLException;
 import javax.media.opengl.GLProfile;
 
 import com.jogamp.common.nio.PointerBuffer;
-import com.jogamp.nativewindow.impl.x11.X11Lib;
-import com.jogamp.nativewindow.impl.x11.X11Util;
-import com.jogamp.nativewindow.impl.x11.XVisualInfo;
-import com.jogamp.opengl.impl.Debug;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory;
-import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil;
+import jogamp.nativewindow.x11.X11Lib;
+import jogamp.nativewindow.x11.X11Util;
+import jogamp.nativewindow.x11.XVisualInfo;
+import jogamp.opengl.Debug;
+import jogamp.opengl.GLGraphicsConfigurationFactory;
+import jogamp.opengl.GLGraphicsConfigurationUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXContext.java
index ba6a566e6..ce5d466d4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXContext.java
@@ -36,7 +36,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java
index 5243e8c46..9e6ef911e 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXContext.java
index 7ee5d51d4..765a8207a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXContext.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
index 65970dab2..8ea989267 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PixmapGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXContext.java
index b7b4da75d..ef8007de4 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PixmapGLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXContext.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.opengl.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PixmapGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java
index 0343ffb02..f5d321561 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PixmapGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java
@@ -38,11 +38,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.impl.x11.glx;
+package jogamp.opengl.x11.glx;
 
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
-import com.jogamp.nativewindow.impl.x11.*;
+import jogamp.nativewindow.x11.*;
 
 public class X11PixmapGLXDrawable extends X11GLXDrawable {
   private long pixmap;
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
index 898a8a658..55f1f034b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
@@ -31,7 +31,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.jogamp.opengl.impl.x11.glx.awt;
+package jogamp.opengl.x11.glx.awt;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
@@ -40,9 +40,9 @@ import javax.media.nativewindow.x11.*;
 import javax.media.nativewindow.awt.*;
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.impl.*;
-import com.jogamp.nativewindow.impl.jawt.x11.*;
-import com.jogamp.nativewindow.impl.x11.*;
+import jogamp.opengl.*;
+import jogamp.nativewindow.jawt.x11.*;
+import jogamp.nativewindow.x11.*;
 
 public class X11AWTGLXGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");