Renamed all files to intended destination packages for JSR-231. The

only package specified by the JSR is "javax.media.opengl". The utility
package com.sun.opengl.utils is Sun-specific and optional. The Cg
binding has been moved into com.sun.opengl.cg. Moved Animator and
FPSAnimator to com.sun.opengl.utils. Updated and tested demos with new
source code locations.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@358 232f8b59-042b-4e1e-8c03-345bb8c30851

238 files changed, 863 insertions, 865 deletions

diff --git a/make/build-gluegen.xml b/make/build-gluegen.xml
index b9e522d3c..fb21071ef 100644
--- a/make/build-gluegen.xml
+++ b/make/build-gluegen.xml
@@ -27,12 +27,12 @@
         </path>
     
         <!-- The location of the GlueGen source and the C grammar files. -->
-        <property name="gluegen" value="${src}/net/java/games/gluegen" />
+        <property name="gluegen" value="${src.java}/com/sun/gluegen" />
         <property name="c.grammar" value="${gluegen}/cgram" />
         
         <!-- The resulting location of the generated Java files from the
            - C grammar via ANTLR. -->
-        <property name="gluegen.build" value="${src.generated.java}/net/java/games/gluegen" />
+        <property name="gluegen.build" value="${src.generated.java}/com/sun/gluegen" />
         <property name="generated.java.from.grammar" value="${gluegen.build}/cgram" />
 
     </target>
@@ -89,7 +89,7 @@
            -        a separate task.  -->
         <javac destdir="${classes}" includes="**/gluegen/**" excludes="**/GlueGenTask.java"
                source="1.4" debug="true" debuglevel="source,lines">
-            <src path="${src}" />
+            <src path="${src.java}" />
             <src path="${src.generated.java}" />
             <classpath refid="antlr.classpath" />
         </javac>
@@ -141,7 +141,7 @@
            - NOTE:  ONLY the GlueGenTask is built at this time.  GlueGen 
            -        itself is built in a separate task.  -->
         <javac destdir="${classes}" includes="**/GlueGenTask.java" source="1.4" debug="true" debuglevel="source,lines">
-            <src path="${src}" />
+            <src path="${src.java}" />
             <classpath refid="antlr.classpath" />
         </javac>
         
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index 0f72bcfa7..9ef1147a3 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -17,7 +17,7 @@
       -->
     <target name="declare" description="Declare properties">
         <!-- The location of the BuildStaticGLInfo source. -->
-        <property name="static.gl.src" value="${src}/net/java/games/gluegen/opengl" />
+        <property name="static.gl.src" value="${src.java}/com/sun/gluegen/opengl" />
     </target>
 
     <!-- ================================================================== -->
@@ -29,7 +29,7 @@
         <mkdir dir="${classes}" />
 
         <!-- Compile BuildStaticGLInfo -->
-        <javac srcdir="${src}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="1.4" debug="true" debuglevel="source,lines">
+        <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="1.4" debug="true" debuglevel="source,lines">
             <classpath refid="antlr.classpath" />
         </javac>
         
@@ -50,7 +50,7 @@
            - NOTE:  ONLY the StaticGLGen is built at this time.  BuildStaticGLInfo 
            -        itself is built in a separate task.  -->
         <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="1.4" debug="true" debuglevel="source,lines">
-	    <src path="${src}" />
+	    <src path="${src.java}" />
             <classpath refid="classpath" />
         </javac>
         
diff --git a/make/build.xml b/make/build.xml
index 8e0437614..58ce61c50 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -123,8 +123,8 @@
              Some of these are used in FileMappers later for dependence information
              and need exact string matching, which is why they use file.separator
              instead of "/". -->
-        <property name="rootrel.src" value="src" />
-        <property name="rootrel.src.c.jogl" value="${rootrel.src}${sep}native${sep}jogl" />
+        <property name="rootrel.src.java" value="src${sep}classes" />
+        <property name="rootrel.src.c.jogl" value="src${sep}native${sep}jogl" />
         <property name="rootrel.build" value="build" />
         <property name="rootrel.src.generated" value="${rootrel.build}${sep}gensrc" />
         <property name="rootrel.generated.java" value="${rootrel.src.generated}${sep}classes" />
@@ -135,19 +135,19 @@
         <property name="rootrel.obj.cg" value="${rootrel.obj}${sep}jogl_cg" />
 
         <!-- The source directories. -->
-        <property name="src"   value="${project.root}/${rootrel.src}" />
-        <property name="src.c" value="${project.root}/${rootrel.src.c}" />
-        <property name="build" value="${project.root}/${rootrel.build}" />
+        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
+        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
+        <property name="build"    value="${project.root}/${rootrel.build}" />
         
         <!-- The generated source directories. -->
         <property name="src.generated" value="${build}/gensrc" />
         <property name="src.generated.java" value="${src.generated}/classes" />
-        <property name="src.generated.java.cg" value="${src.generated}/classes/net/java/games/cg" />
+        <property name="src.generated.java.cg" value="${src.generated}/classes/com/sun/opengl/cg" />
         <property name="src.generated.c" value="${src.generated}/native/jogl" />
         <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" />
         <!-- The composable pipeline source files -->
         <property name="src.generated.java.pipeline"
-                  value="net/java/games/jogl/DebugGL.java,net/java/games/jogl/TraceGL.java" />
+                  value="javax/media/opengl/DebugGL.java,javax/media/opengl/TraceGL.java" />
         
         <!-- The compiler output directories. -->
         <property name="classes" value="${build}/classes" />
@@ -214,10 +214,10 @@
         <property name="java.lib.dir.macosx" value="/System/Library/Frameworks/JavaVM.framework/Libraries" />
         <property name="gl.headers" value="${stub.includes.dir}/opengl/**/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
 
-        <!-- Java files to exclude based on platform (relative to "src") -->
-        <property name="java.excludes.win32" value="net/java/games/jogl/impl/x11/**, net/java/games/jogl/impl/macosx/**" />
-        <property name="java.excludes.x11" value="net/java/games/jogl/impl/windows/**, net/java/games/jogl/impl/macosx/**" />
-        <property name="java.excludes.macosx" value="net/java/games/jogl/impl/x11/**, net/java/games/jogl/impl/windows/**" />
+        <!-- Java files to exclude based on platform (relative to "src.java") -->
+        <property name="java.excludes.win32" value="com/sun/opengl/impl/x11/**, com/sun/opengl/impl/macosx/**" />
+        <property name="java.excludes.x11" value="com/sun/opengl/impl/windows/**, com/sun/opengl/impl/macosx/**" />
+        <property name="java.excludes.macosx" value="com/sun/opengl/impl/x11/**, com/sun/opengl/impl/windows/**" />
 
         <!-- Create the classpath for that includes ANTLR and any already 
            - compiled classes.  This requires the user-defined "antlr.jar" 
@@ -235,11 +235,11 @@
         <property name="javadoc" value="${project.root}/javadoc_public" />
         <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" />
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
-        <property name="javadoc.packagenames" value="net.java.games.jogl,net.java.games.gluegen.runtime,net.java.games.jogl.util" />
-        <property name="javadoc.dev.packagenames.win32"  value="net.java.games.jogl.impl.windows" />
-        <property name="javadoc.dev.packagenames.x11"    value="net.java.games.jogl.impl.x11" />
-        <property name="javadoc.dev.packagenames.macosx" value="net.java.games.jogl.impl.macosx" />
-        <property name="javadoc.dev.packagenames" value="net.java.games.jogl,net.java.games.jogl.impl,net.java.games.jogl.util,net.java.games.gluegen" />
+        <property name="javadoc.packagenames" value="javax.media.opengl,com.sun.opengl.utils" />
+        <property name="javadoc.dev.packagenames.win32"  value="com.sun.opengl.impl.windows" />
+        <property name="javadoc.dev.packagenames.x11"    value="com.sun.opengl.impl.x11" />
+        <property name="javadoc.dev.packagenames.macosx" value="com.sun.opengl.impl.macosx" />
+        <property name="javadoc.dev.packagenames" value="javax.media.opengl,com.sun.opengl.impl,com.sun.opengl.utils,com.sun.gluegen,com.sun.gluegen.runtime" />
         
     </target>
     
@@ -432,7 +432,7 @@
         <dependset>
             <srcfileset refid="stub.includes.dependencies.fileset" />
             <srcfileset dir=".">
-	        <include name="${classes}/net/java/games/gluegen/**/*.class" />
+	        <include name="${classes}/com/sun/gluegen/**/*.class" />
             </srcfileset>
             <targetfileset dir=".">
                 <include name="${src.generated.java}/**/*.java" />
@@ -443,7 +443,7 @@
         <!-- Now check for the presence of one well-known file -->
         <uptodate property="java.generate.skip">
             <srcfiles refid="stub.includes.dependencies.fileset" />
-            <mapper type="merge" to="${src.generated.java}/net/java/games/jogl/GL.java" />
+            <mapper type="merge" to="${src.generated.java}/javax/media/opengl/GL.java" />
         </uptodate>
     </target>
 
@@ -463,9 +463,9 @@
         </path>
     
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="net.java.games.gluegen.ant.GlueGenTask"
+        <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
                  classpathref="gen.classpath" />
-        <taskdef name="staticglgen" classname="net.java.games.gluegen.ant.StaticGLGenTask"
+        <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask"
                  classpathref="gen.classpath" />
                  
         <!-- Use the GlueGen and BuildStaticGLInfo tasks to generate the 
@@ -476,7 +476,7 @@
         <gluegen src="${stub.includes.common}/gl.c" 
                  config="${gl.cfg}"
                  includeRefid="stub.includes.fileset.all"
-                 emitter="net.java.games.gluegen.opengl.GLEmitter">
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
 
@@ -485,7 +485,7 @@
         <gluegen src="${glext.platform.header}" 
                  config="${glext.platform.cfg}"
                  includeRefid="stub.includes.fileset.all"
-                 emitter="net.java.games.gluegen.opengl.GLEmitter">
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
 
@@ -500,7 +500,7 @@
                  config="${jawt.cfg}"
                  literalInclude="${java.includes.dir}"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="net.java.games.gluegen.JavaEmitter">
+                 emitter="com.sun.gluegen.JavaEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
 
@@ -509,15 +509,15 @@
         <gluegen src="${stub.includes.platform}/window-system.c" 
                  config="${window.cfg}"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="net.java.games.gluegen.opengl.GLEmitter">
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
 
 	<!-- Generate StaticGLInfo class -->
         <echo message="Generating StaticGLInfo class" />
-        <staticglgen package="net.java.games.jogl.impl"
+        <staticglgen package="com.sun.opengl.impl"
                      headers="${gl.headers}"
-                     outputdir="${src.generated.java}/net/java/games/jogl/impl">
+                     outputdir="${src.generated.java}/com/sun/opengl/impl">
             <classpath refid="gen.classpath" />
         </staticglgen>
 
@@ -526,7 +526,7 @@
         <gluegen src="${stub.includes.common}/glu.c" 
                  config="${glu.cfg}"
                  includeRefid="stub.includes.fileset.all"
-                 emitter="net.java.games.gluegen.opengl.GLEmitter">
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
 
@@ -535,7 +535,7 @@
         <gluegen src="${stub.includes.common}/glu-impl.c" 
                  config="${glu.impl.cfg}"
                  includeRefid="stub.includes.fileset.all"
-                 emitter="net.java.games.gluegen.opengl.GLEmitter">
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
 
@@ -560,7 +560,7 @@
         <!-- Now check for the presence of one well-known file -->
         <uptodate property="java.generate.cg.skip">
             <srcfiles refid="stub.includes.cg.dependencies.fileset" />
-            <mapper type="merge" to="${src.generated.java}/net/java/games/cg/CgGL.java" />
+            <mapper type="merge" to="${src.generated.java}/com/sun/opengl/cg/CgGL.java" />
         </uptodate>
     </target>
 
@@ -580,16 +580,16 @@
         </path>
     
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="net.java.games.gluegen.ant.GlueGenTask"
+        <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
                  classpathref="gen.classpath" />
-        <taskdef name="staticglgen" classname="net.java.games.gluegen.ant.StaticGLGenTask"
+        <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask"
                  classpathref="gen.classpath" />
 
         <!-- Generate CgGL interface class -->
         <gluegen src="${stub.includes.common}/cg.c" 
                  config="cg-common.cfg"
                  includeRefid="stub.includes.cg.fileset.all"
-                 emitter="net.java.games.gluegen.JavaEmitter">
+                 emitter="com.sun.gluegen.JavaEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
     </target>
@@ -602,28 +602,28 @@
         <!-- Blow away the DebugGL.java and TraceGL.java sources if GL.class has changed
              (the uptodate element doesn't support arbitrary source and destination files) -->
         <dependset>
-            <srcfilelist dir="${classes}/net/java/games/jogl" files="GL.class" />
-            <srcfilelist dir="${classes}/net/java/games/gluegen/opengl" files="BuildComposablePipeline.class" />
-            <targetfileset dir="${src.generated.java}/net/java/games/jogl"
+            <srcfilelist dir="${classes}/javax/media/opengl" files="GL.class" />
+            <srcfilelist dir="${classes}/com/sun/gluegen/opengl" files="BuildComposablePipeline.class" />
+            <targetfileset dir="${src.generated.java}/javax/media/opengl"
                            includes="DebugGL.java,TraceGL.java" />
         </dependset>
                            
         <!-- Now choose one of the two to test to see if we have to regenerate -->
         <uptodate property="java.compile.composable.pipeline.skip"
-                  srcfile="${classes}/net/java/games/jogl/GL.class"
-                  targetfile="${src.generated.java}/net/java/games/jogl/DebugGL.java" />
+                  srcfile="${classes}/javax/media/opengl/GL.class"
+                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL.java" />
     </target>        
 
     <target name="java.compile.composable.pipeline" depends="java.compile.composable.pipeline.check" unless="java.compile.composable.pipeline.skip">
-        <java classname="net.java.games.gluegen.opengl.BuildComposablePipeline" fork="yes">
-            <arg value="net.java.games.jogl.GL" />
-            <arg value="${src.generated.java}/net/java/games/jogl" />
+        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes">
+            <arg value="javax.media.opengl.GL" />
+            <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="antlr.classpath" />
         </java>
 
         <!-- Perform the second pass Java compile which compiles the composable pipelines. -->
         <javac destdir="${classes}" includes="${src.generated.java.pipeline}" source="1.4" debug="true" debuglevel="source,lines">
-            <src path="${src}" />
+            <src path="${src.java}" />
             <src path="${src.generated.java}" />
             <classpath refid="antlr.classpath" />
         </javac>
@@ -638,8 +638,8 @@
     <target name="java.compile" depends="java.generate,java.generate.cg">
         <!-- Perform the first pass Java compile. -->
         <javac destdir="${classes}"
-               excludes="${java.excludes.platform},net/java/games/jogl/impl/nurbs/**" source="1.4" debug="true" debuglevel="source,lines">
-            <src path="${src}" />
+               excludes="${java.excludes.platform},com/sun/opengl/impl/nurbs/**" source="1.4" debug="true" debuglevel="source,lines">
+            <src path="${src.java}" />
             <src path="${src.generated.java}" />
             <classpath refid="antlr.classpath" />
         </javac>
@@ -890,9 +890,11 @@
         <!-- Build the jar excluding any build specific classes. -->
         <jar destfile="${jogl.jar}">
             <fileset dir="${classes}">
-                <include name="net/java/games/jogl/**" />
-                <include name="net/java/games/gluegen/runtime/**" />
-                <include name="net/java/games/cg/**" />
+                <include name="javax/media/opengl/**" />
+                <include name="com/sun/gluegen/runtime/**" />
+                <include name="com/sun/opengl/impl/**" />
+                <include name="com/sun/opengl/utils/**" />
+                <include name="com/sun/opengl/cg/**" />
             </fileset>
         </jar>
 
@@ -908,7 +910,7 @@
     <target name="javadoc.nocg" depends="setup.java.home.dir,init" unless="jogl.cg">
         <!-- Build the general Javadoc -->
         <javadoc packagenames="${javadoc.packagenames}"
-                 sourcepath="${src};${src.generated.java}"        
+                 sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc}" windowtitle="JOGL API"
                  source="1.4"
                  link="${javadoc.link}" />
@@ -917,8 +919,8 @@
     <!-- Same as above but with Cg directories added -->
     <target name="javadoc.cg" depends="setup.java.home.dir,init" if="jogl.cg">
         <!-- Build the general Javadoc -->
-        <javadoc packagenames="${javadoc.packagenames},net.java.games.cg"
-                 sourcepath="${src};${src.generated.java}"        
+        <javadoc packagenames="${javadoc.packagenames},com.sun.opengl.cg"
+                 sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc}" windowtitle="JOGL API"
                  source="1.4"
                  link="${javadoc.link}" />
@@ -929,7 +931,7 @@
     <target name="javadoc.dev.nocg" depends="init" unless="jogl.cg">
         <!-- Build the internal developer Javadoc -->
         <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform}"
-                 sourcepath="${src};${src.generated.java}"        
+                 sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc.dev}" windowtitle="JOGL API"
                  source="1.4"
                  link="${javadoc.link}" />
@@ -938,8 +940,8 @@
     <!-- Same as above but with Cg directories added -->
     <target name="javadoc.dev.cg" depends="init" if="jogl.cg">
         <!-- Build the internal developer Javadoc -->
-        <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform},net.java.games.cg"
-                 sourcepath="${src};${src.generated.java}"        
+        <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform},com.sun.opengl.cg"
+                 sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc.dev}" windowtitle="JOGL API"
                  source="1.4"
                  link="${javadoc.link}" />
diff --git a/make/cg-common.cfg b/make/cg-common.cfg
index 2edc2f1a6..4e42ceb48 100644
--- a/make/cg-common.cfg
+++ b/make/cg-common.cfg
@@ -1,7 +1,6 @@
 # This .cfg file provides common options used among all Cg glue code
 # generated for Jogl on all platforms.
-Package net.java.games.cg
-ImplPackage net.java.games.cg.impl
+Package com.sun.opengl.cg
 JavaClass CgGL
 Style AllStatic
 JavaOutputDir ../build/gensrc/classes
diff --git a/make/cgl-macosx.cfg b/make/cgl-macosx.cfg
index 183c777be..b19d172fe 100644
--- a/make/cgl-macosx.cfg
+++ b/make/cgl-macosx.cfg
@@ -1,6 +1,6 @@
 # This .cfg file is used to generate the interface to the CGL routines
 # used internally by the MacOSXGLContext implementation.
-Package net.java.games.jogl.impl.macosx
+Package com.sun.opengl.impl.macosx
 JavaOutputDir ..\build\gensrc\classes
 NativeOutputDir ..\build\gensrc\native\jogl
 JavaClass CGL
diff --git a/make/cglext.cfg b/make/cglext.cfg
index 52fad76c8..74e7ac841 100755
--- a/make/cglext.cfg
+++ b/make/cglext.cfg
@@ -3,10 +3,10 @@
 # Note that there are currently no such extensions exposed on Mac OS
 # X, but if in the future there are, this structure will allow them to
 # be easily exposed.
-Package net.java.games.jogl.impl.macosx
+Package com.sun.opengl.impl.macosx
 Style InterfaceAndImpl
 JavaClass CGLExt
-ImplPackage net.java.games.jogl.impl.macosx
+ImplPackage com.sun.opengl.impl.macosx
 ImplJavaClass CGLExtImpl
 Include gl-common-macosx.cfg
 
diff --git a/make/gl-common.cfg b/make/gl-common.cfg
index 1b97d42aa..b15a7e8c1 100644
--- a/make/gl-common.cfg
+++ b/make/gl-common.cfg
@@ -7,8 +7,8 @@ RuntimeExceptionType GLException
 # Imports needed by all glue code
 Import java.nio.*
 Import java.util.*
-Import net.java.games.jogl.*
-Import net.java.games.jogl.impl.*
+Import javax.media.opengl.*
+Import com.sun.opengl.impl.*
 
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
diff --git a/make/gl-impl-CustomCCode.c b/make/gl-impl-CustomCCode.c
index 5c3b04aaa..2ea5376e7 100644
--- a/make/gl-impl-CustomCCode.c
+++ b/make/gl-impl-CustomCCode.c
@@ -4,7 +4,7 @@
  *     C function: LPVOID glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_net_java_games_jogl_impl_GLImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   LPVOID _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -19,7 +19,7 @@ Java_net_java_games_jogl_impl_GLImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject
  *     C function: LPVOID glMapBufferARB(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_net_java_games_jogl_impl_GLImpl_dispatch_1glMapBufferARB(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLImpl_dispatch_1glMapBufferARB(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERARBPROC ptr_glMapBufferARB;
   LPVOID _res;
   ptr_glMapBufferARB = (PFNGLMAPBUFFERARBPROC) (intptr_t) glProcAddress;
diff --git a/make/gl-macosx.cfg b/make/gl-macosx.cfg
index 79e7e97b0..156f66b77 100644
--- a/make/gl-macosx.cfg
+++ b/make/gl-macosx.cfg
@@ -1,8 +1,8 @@
 # This .cfg file is used to generate the GL interface and implementing class.
-Package net.java.games.jogl
+Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GL
-ImplPackage net.java.games.jogl.impl
+ImplPackage com.sun.opengl.impl
 ImplJavaClass GLImpl
 Include gl-common-macosx.cfg
 
diff --git a/make/gl-win32.cfg b/make/gl-win32.cfg
index d0e872871..950d67320 100644
--- a/make/gl-win32.cfg
+++ b/make/gl-win32.cfg
@@ -1,8 +1,8 @@
 # This .cfg file is used to generate the GL interface and implementing class.
-Package net.java.games.jogl
+Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GL
-ImplPackage net.java.games.jogl.impl
+ImplPackage com.sun.opengl.impl
 ImplJavaClass GLImpl
 Include gl-common-win32.cfg
 
diff --git a/make/gl-x11.cfg b/make/gl-x11.cfg
index f5b8a1156..fd793c5b9 100644
--- a/make/gl-x11.cfg
+++ b/make/gl-x11.cfg
@@ -1,8 +1,8 @@
 # This .cfg file is used to generate the GL interface and implementing class.
-Package net.java.games.jogl
+Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GL
-ImplPackage net.java.games.jogl.impl
+ImplPackage com.sun.opengl.impl
 ImplJavaClass GLImpl
 Include gl-common-x11.cfg
 
diff --git a/make/glu-common.cfg b/make/glu-common.cfg
index 917a95a62..2cb53c13a 100644
--- a/make/glu-common.cfg
+++ b/make/glu-common.cfg
@@ -1,7 +1,7 @@
 # This .cfg file provides common options used among all GLU glue code
 # generated for Jogl on all platforms.
-Package net.java.games.jogl
-ImplPackage net.java.games.jogl.impl
+Package javax.media.opengl
+ImplPackage com.sun.opengl.impl
 JavaClass GLU
 ImplJavaClass GLUImpl
 JavaOutputDir ../build/gensrc/classes
@@ -12,8 +12,8 @@ HierarchicalNativeOutput false
 # Imports needed by all glue code
 #
 Import java.nio.*
-Import net.java.games.jogl.*
-Import net.java.games.jogl.impl.*
+Import javax.media.opengl.*
+Import com.sun.opengl.impl.*
 
 # Raise GLException instead of RuntimeException in glue code
 RuntimeExceptionType GLException
diff --git a/make/glu-impl-common-CustomCCode.c b/make/glu-impl-common-CustomCCode.c
index 5a3f645c5..fdcf954d5 100644
--- a/make/glu-impl-common-CustomCCode.c
+++ b/make/glu-impl-common-CustomCCode.c
@@ -7,7 +7,7 @@
  *     C function: GLint gluBuild1DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jbyteArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jbyteArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPLEVELSPROC ptr_gluBuild1DMipmapLevels;
   void * _ptr8 = NULL;
   GLint _res;
@@ -30,7 +30,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild1DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jshortArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jshortArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPLEVELSPROC ptr_gluBuild1DMipmapLevels;
   void * _ptr8 = NULL;
   GLint _res;
@@ -53,7 +53,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild1DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jintArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jintArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPLEVELSPROC ptr_gluBuild1DMipmapLevels;
   void * _ptr8 = NULL;
   GLint _res;
@@ -76,7 +76,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild1DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jfloatArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jfloatArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPLEVELSPROC ptr_gluBuild1DMipmapLevels;
   void * _ptr8 = NULL;
   GLint _res;
@@ -99,7 +99,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild1DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jobject data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jint level, jint base, jint max, jobject data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPLEVELSPROC ptr_gluBuild1DMipmapLevels;
   void * _ptr8 = NULL;
   GLint _res;
@@ -121,7 +121,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild1DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jbyteArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jbyteArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPSPROC ptr_gluBuild1DMipmaps;
   void * _ptr5 = NULL;
   GLint _res;
@@ -144,7 +144,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3BJ(JNI
  *     C function: GLint gluBuild1DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jshortArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jshortArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPSPROC ptr_gluBuild1DMipmaps;
   void * _ptr5 = NULL;
   GLint _res;
@@ -167,7 +167,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3SJ(JNI
  *     C function: GLint gluBuild1DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jintArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jintArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPSPROC ptr_gluBuild1DMipmaps;
   void * _ptr5 = NULL;
   GLint _res;
@@ -190,7 +190,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3IJ(JNI
  *     C function: GLint gluBuild1DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jfloatArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jfloatArray data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPSPROC ptr_gluBuild1DMipmaps;
   void * _ptr5 = NULL;
   GLint _res;
@@ -213,7 +213,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIII_3FJ(JNI
  *     C function: GLint gluBuild1DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jobject data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint format, jint type, jobject data, jlong glProcAddress) {
   PFNGLUBUILD1DMIPMAPSPROC ptr_gluBuild1DMipmaps;
   void * _ptr5 = NULL;
   GLint _res;
@@ -235,7 +235,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild1DMipmaps__IIIIILjava_ni
  *     C function: GLint gluBuild2DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jbyteArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jbyteArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPLEVELSPROC ptr_gluBuild2DMipmapLevels;
   void * _ptr9 = NULL;
   GLint _res;
@@ -258,7 +258,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild2DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jshortArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jshortArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPLEVELSPROC ptr_gluBuild2DMipmapLevels;
   void * _ptr9 = NULL;
   GLint _res;
@@ -281,7 +281,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild2DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jintArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jintArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPLEVELSPROC ptr_gluBuild2DMipmapLevels;
   void * _ptr9 = NULL;
   GLint _res;
@@ -304,7 +304,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild2DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jfloatArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jfloatArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPLEVELSPROC ptr_gluBuild2DMipmapLevels;
   void * _ptr9 = NULL;
   GLint _res;
@@ -327,7 +327,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild2DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jobject data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jint level, jint base, jint max, jobject data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPLEVELSPROC ptr_gluBuild2DMipmapLevels;
   void * _ptr9 = NULL;
   GLint _res;
@@ -349,7 +349,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jbyteArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jbyteArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPSPROC ptr_gluBuild2DMipmaps;
   void * _ptr6 = NULL;
   GLint _res;
@@ -372,7 +372,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3BJ(JN
  *     C function: GLint gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jshortArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jshortArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPSPROC ptr_gluBuild2DMipmaps;
   void * _ptr6 = NULL;
   GLint _res;
@@ -395,7 +395,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3SJ(JN
  *     C function: GLint gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jintArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jintArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPSPROC ptr_gluBuild2DMipmaps;
   void * _ptr6 = NULL;
   GLint _res;
@@ -418,7 +418,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3IJ(JN
  *     C function: GLint gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jfloatArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jfloatArray data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPSPROC ptr_gluBuild2DMipmaps;
   void * _ptr6 = NULL;
   GLint _res;
@@ -441,7 +441,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIII_3FJ(JN
  *     C function: GLint gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jobject data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint format, jint type, jobject data, jlong glProcAddress) {
   PFNGLUBUILD2DMIPMAPSPROC ptr_gluBuild2DMipmaps;
   void * _ptr6 = NULL;
   GLint _res;
@@ -463,7 +463,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild2DMipmaps__IIIIIILjava_n
  *     C function: GLint gluBuild3DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jbyteArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jbyteArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPLEVELSPROC ptr_gluBuild3DMipmapLevels;
   void * _ptr10 = NULL;
   GLint _res;
@@ -486,7 +486,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild3DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jshortArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jshortArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPLEVELSPROC ptr_gluBuild3DMipmapLevels;
   void * _ptr10 = NULL;
   GLint _res;
@@ -509,7 +509,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild3DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jintArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jintArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPLEVELSPROC ptr_gluBuild3DMipmapLevels;
   void * _ptr10 = NULL;
   GLint _res;
@@ -532,7 +532,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild3DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jfloatArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jfloatArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPLEVELSPROC ptr_gluBuild3DMipmapLevels;
   void * _ptr10 = NULL;
   GLint _res;
@@ -555,7 +555,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild3DMipmapLevels(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jobject data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jint level, jint base, jint max, jobject data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPLEVELSPROC ptr_gluBuild3DMipmapLevels;
   void * _ptr10 = NULL;
   GLint _res;
@@ -577,7 +577,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmapLevels__IIIIIIII
  *     C function: GLint gluBuild3DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jbyteArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3BJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jbyteArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPSPROC ptr_gluBuild3DMipmaps;
   void * _ptr7 = NULL;
   GLint _res;
@@ -600,7 +600,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3BJ(J
  *     C function: GLint gluBuild3DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jshortArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3SJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jshortArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPSPROC ptr_gluBuild3DMipmaps;
   void * _ptr7 = NULL;
   GLint _res;
@@ -623,7 +623,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3SJ(J
  *     C function: GLint gluBuild3DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jintArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3IJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jintArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPSPROC ptr_gluBuild3DMipmaps;
   void * _ptr7 = NULL;
   GLint _res;
@@ -646,7 +646,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3IJ(J
  *     C function: GLint gluBuild3DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jfloatArray data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3FJ(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jfloatArray data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPSPROC ptr_gluBuild3DMipmaps;
   void * _ptr7 = NULL;
   GLint _res;
@@ -669,7 +669,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIII_3FJ(J
  *     C function: GLint gluBuild3DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *  data);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jobject data, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint target, jint internalFormat, jint width, jint height, jint depth, jint format, jint type, jobject data, jlong glProcAddress) {
   PFNGLUBUILD3DMIPMAPSPROC ptr_gluBuild3DMipmaps;
   void * _ptr7 = NULL;
   GLint _res;
@@ -691,7 +691,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluBuild3DMipmaps__IIIIIIILjava_
  *     C function: GLint gluScaleImage(GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *  dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid *  dataOut);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3BIII_3BJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jbyteArray dataIn, jint wOut, jint hOut, jint typeOut, jbyteArray dataOut, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3BIII_3BJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jbyteArray dataIn, jint wOut, jint hOut, jint typeOut, jbyteArray dataOut, jlong glProcAddress) {
   PFNGLUSCALEIMAGEPROC ptr_gluScaleImage;
   void * _ptr4 = NULL;
   GLvoid * _ptr8 = NULL;
@@ -721,7 +721,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3BIII_3BJ(JN
  *     C function: GLint gluScaleImage(GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *  dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid *  dataOut);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3SIII_3SJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jshortArray dataIn, jint wOut, jint hOut, jint typeOut, jshortArray dataOut, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3SIII_3SJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jshortArray dataIn, jint wOut, jint hOut, jint typeOut, jshortArray dataOut, jlong glProcAddress) {
   PFNGLUSCALEIMAGEPROC ptr_gluScaleImage;
   void * _ptr4 = NULL;
   GLvoid * _ptr8 = NULL;
@@ -751,7 +751,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3SIII_3SJ(JN
  *     C function: GLint gluScaleImage(GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *  dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid *  dataOut);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3IIII_3IJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jintArray dataIn, jint wOut, jint hOut, jint typeOut, jintArray dataOut, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3IIII_3IJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jintArray dataIn, jint wOut, jint hOut, jint typeOut, jintArray dataOut, jlong glProcAddress) {
   PFNGLUSCALEIMAGEPROC ptr_gluScaleImage;
   void * _ptr4 = NULL;
   GLvoid * _ptr8 = NULL;
@@ -781,7 +781,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3IIII_3IJ(JN
  *     C function: GLint gluScaleImage(GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *  dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid *  dataOut);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3FIII_3FJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jfloatArray dataIn, jint wOut, jint hOut, jint typeOut, jfloatArray dataOut, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3FIII_3FJ(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jfloatArray dataIn, jint wOut, jint hOut, jint typeOut, jfloatArray dataOut, jlong glProcAddress) {
   PFNGLUSCALEIMAGEPROC ptr_gluScaleImage;
   void * _ptr4 = NULL;
   GLvoid * _ptr8 = NULL;
@@ -811,7 +811,7 @@ Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIII_3FIII_3FJ(JN
  *     C function: GLint gluScaleImage(GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *  dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid *  dataOut);
  */
 JNIEXPORT jint JNICALL 
-Java_net_java_games_jogl_impl_GLUImpl_dispatch_1gluScaleImage__IIIILjava_nio_Buffer_2IIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jobject dataIn, jint wOut, jint hOut, jint typeOut, jobject dataOut, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLUImpl_dispatch_1gluScaleImage__IIIILjava_nio_Buffer_2IIILjava_nio_Buffer_2J(JNIEnv *env, jobject _unused, jint format, jint wIn, jint hIn, jint typeIn, jobject dataIn, jint wOut, jint hOut, jint typeOut, jobject dataOut, jlong glProcAddress) {
   PFNGLUSCALEIMAGEPROC ptr_gluScaleImage;
   void * _ptr4 = NULL;
   GLvoid * _ptr8 = NULL;
diff --git a/make/glu-impl-common.cfg b/make/glu-impl-common.cfg
index 6710d0369..b2336d593 100644
--- a/make/glu-impl-common.cfg
+++ b/make/glu-impl-common.cfg
@@ -11,8 +11,8 @@ GetProcAddressTableExpr gluProcAddressTable
 
 # GLUImpl needs access to the GLUtesselatorImpl class for GLUtesselator
 # and to the Mipmap class for scaling and mipmap generation
-Import net.java.games.jogl.impl.tesselator.GLUtesselatorImpl
-Import net.java.games.jogl.impl.mipmap.Mipmap
+Import com.sun.opengl.impl.tesselator.GLUtesselatorImpl
+Import com.sun.opengl.impl.mipmap.Mipmap
 Import java.security.*
 
 # Custom Java code for GLUImpl class
diff --git a/make/glu-interface-common-CustomJavaCode.java b/make/glu-interface-common-CustomJavaCode.java
index 65fde599f..8f7ee4dac 100644
--- a/make/glu-interface-common-CustomJavaCode.java
+++ b/make/glu-interface-common-CustomJavaCode.java
@@ -47,78 +47,78 @@ public boolean gluUnProject4(double winX, double winY, double winZ, double clipW
 //
 
 /*****************************************************************************
- * <b>gluBeginPolygon</b> and {@link net.java.games.jogl.GLU#gluEndPolygon
+ * <b>gluBeginPolygon</b> and {@link javax.media.opengl.GLU#gluEndPolygon
  * gluEndPolygon} delimit the definition of a nonconvex polygon. To define
  * such a polygon, first call <b>gluBeginPolygon</b>. Then define the contours
- * of the polygon by calling {@link net.java.games.jogl.GLU#gluTessVertex
+ * of the polygon by calling {@link javax.media.opengl.GLU#gluTessVertex
  * gluTessVertex} for each vertex and
- * {@link net.java.games.jogl.GLU#gluNextContour gluNextContour} to start each
- * new contour. Finally, call {@link net.java.games.jogl.GLU#gluEndPolygon
+ * {@link javax.media.opengl.GLU#gluNextContour gluNextContour} to start each
+ * new contour. Finally, call {@link javax.media.opengl.GLU#gluEndPolygon
  * gluEndPolygon} to signal the end of the definition. See the
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex} and
- * {@link net.java.games.jogl.GLU#gluNextContour gluNextContour} reference
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex} and
+ * {@link javax.media.opengl.GLU#gluNextContour gluNextContour} reference
  * pages for more details.<P>
  *
- * Once {@link net.java.games.jogl.GLU#gluEndPolygon gluEndPolygon} is called,
+ * Once {@link javax.media.opengl.GLU#gluEndPolygon gluEndPolygon} is called,
  * the polygon is tessellated, and the resulting triangles are described
- * through callbacks. See {@link net.java.games.jogl.GLU#gluTessCallback
+ * through callbacks. See {@link javax.media.opengl.GLU#gluTessCallback
  * gluTessCallback} for descriptions of the callback methods.
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
- *
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluNextContour      gluNextContour
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
+ *
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluNextContour      gluNextContour
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour
  ****************************************************************************/
 public void gluBeginPolygon(GLUtesselator tesselator);
 
 
 /*****************************************************************************
  * <b>gluDeleteTess</b> destroys the indicated tessellation object (which was
- * created with {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
+ * created with {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
  *
  * @param tesselator
  *        Specifies the tessellation object to destroy.
  *
- * @see net.java.games.jogl.GLU#gluBeginPolygon gluBeginPolygon
- * @see net.java.games.jogl.GLU#gluNewTess      gluNewTess
- * @see net.java.games.jogl.GLU#gluTessCallback gluTessCallback
+ * @see javax.media.opengl.GLU#gluBeginPolygon gluBeginPolygon
+ * @see javax.media.opengl.GLU#gluNewTess      gluNewTess
+ * @see javax.media.opengl.GLU#gluTessCallback gluTessCallback
  ****************************************************************************/
 public void gluDeleteTess(GLUtesselator tesselator);
 
 
 /*****************************************************************************
- * <b>gluEndPolygon</b> and {@link net.java.games.jogl.GLU#gluBeginPolygon
+ * <b>gluEndPolygon</b> and {@link javax.media.opengl.GLU#gluBeginPolygon
  * gluBeginPolygon} delimit the definition of a nonconvex polygon. To define
- * such a polygon, first call {@link net.java.games.jogl.GLU#gluBeginPolygon
+ * such a polygon, first call {@link javax.media.opengl.GLU#gluBeginPolygon
  * gluBeginPolygon}. Then define the contours of the polygon by calling
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex} for each vertex
- * and {@link net.java.games.jogl.GLU#gluNextContour gluNextContour} to start
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex} for each vertex
+ * and {@link javax.media.opengl.GLU#gluNextContour gluNextContour} to start
  * each new contour. Finally, call <b>gluEndPolygon</b> to signal the end of
- * the definition. See the {@link net.java.games.jogl.GLU#gluTessVertex
- * gluTessVertex} and {@link net.java.games.jogl.GLU#gluNextContour
+ * the definition. See the {@link javax.media.opengl.GLU#gluTessVertex
+ * gluTessVertex} and {@link javax.media.opengl.GLU#gluNextContour
  * gluNextContour} reference pages for more details.<P>
  *
  * Once <b>gluEndPolygon</b> is called, the polygon is tessellated, and the
  * resulting triangles are described through callbacks. See
- * {@link net.java.games.jogl.GLU#gluTessCallback gluTessCallback} for
+ * {@link javax.media.opengl.GLU#gluTessCallback gluTessCallback} for
  * descriptions of the callback methods.
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
- *
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluNextContour      gluNextContour
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
+ *
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluNextContour      gluNextContour
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour
  ****************************************************************************/
 public void gluEndPolygon(GLUtesselator tesselator);
 
@@ -127,12 +127,12 @@ public void gluEndPolygon(GLUtesselator tesselator);
  * <b>gluGetTessProperty</b> retrieves properties stored in a tessellation
  * object.  These properties affect the way that tessellation objects are
  * interpreted and rendered.  See the
- * {@link net.java.games.jogl.GLU#gluTessProperty gluTessProperty} reference
+ * {@link javax.media.opengl.GLU#gluTessProperty gluTessProperty} reference
  * page for information about the properties and what they do.
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
  * @param which
  *        Specifies the property whose value is to be fetched. Valid values
  *        are <b>GLU_TESS_WINDING_RULE</b>, <b>GLU_TESS_BOUNDARY_ONLY</b>,
@@ -141,8 +141,8 @@ public void gluEndPolygon(GLUtesselator tesselator);
  *        Specifices an array into which the value of the named property is
  *        written.
  *
- * @see net.java.games.jogl.GLU#gluNewTess      gluNewTess
- * @see net.java.games.jogl.GLU#gluTessProperty gluTessProperty
+ * @see javax.media.opengl.GLU#gluNewTess      gluNewTess
+ * @see javax.media.opengl.GLU#gluTessProperty gluTessProperty
  ****************************************************************************/
 public void gluGetTessProperty(GLUtesselator tesselator, int which, double[] value, int value_offset);
 
@@ -155,9 +155,9 @@ public void gluGetTessProperty(GLUtesselator tesselator, int which, double[] val
  *
  * @return A new tessellation object.
  *
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluDeleteTess       gluDeleteTess
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluDeleteTess       gluDeleteTess
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
  ****************************************************************************/
 public GLUtesselator gluNewTess();
 
@@ -165,10 +165,10 @@ public GLUtesselator gluNewTess();
 /*****************************************************************************
  * <b>gluNextContour</b> is used to describe polygons with multiple
  * contours. After you describe the first contour through a series of
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex} calls, a
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex} calls, a
  * <b>gluNextContour</b> call indicates that the previous contour is complete
  * and that the next contour is about to begin. Perform another series of
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex} calls to
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex} calls to
  * describe the new contour. Repeat this process until all contours have been
  * described.<P>
  *
@@ -210,99 +210,99 @@ public GLUtesselator gluNewTess();
  * <UL>
  *   <b>Note:</b>  The <b>gluNextContour</b> function is obsolete and is
  *   provided for backward compatibility only. The <b>gluNextContour</b>
- *   function is mapped to {@link net.java.games.jogl.GLU#gluTessEndContour
+ *   function is mapped to {@link javax.media.opengl.GLU#gluTessEndContour
  *   gluTessEndContour} followed by
- *   {@link net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour}.
+ *   {@link javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour}.
  * </UL>
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
  * @param type
  *        The type of the contour being defined.
  *
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessEndContour   gluTessEndContour
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessEndContour   gluTessEndContour
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
  ****************************************************************************/
 public void gluNextContour(GLUtesselator tesselator, int type);
 
 
 /*****************************************************************************
  * <b>gluTessBeginContour</b> and
- * {@link net.java.games.jogl.GLU#gluTessEndContour gluTessEndContour} delimit
+ * {@link javax.media.opengl.GLU#gluTessEndContour gluTessEndContour} delimit
  * the definition of a polygon contour. Within each
  * <b>gluTessBeginContour</b>/
- * {@link net.java.games.jogl.GLU#gluTessEndContour gluTessEndContour} pair,
+ * {@link javax.media.opengl.GLU#gluTessEndContour gluTessEndContour} pair,
  * there can be zero or more calls to
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex}. The vertices
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex}. The vertices
  * specify a closed contour (the last vertex of each contour is automatically
- * linked to the first). See the {@link net.java.games.jogl.GLU#gluTessVertex
+ * linked to the first). See the {@link javax.media.opengl.GLU#gluTessVertex
  * gluTessVertex} reference page for more details. <b>gluTessBeginContour</b>
  * can only be called between
- * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon} and
- * {@link net.java.games.jogl.GLU#gluTessEndPolygon gluTessEndPolygon}.
+ * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon} and
+ * {@link javax.media.opengl.GLU#gluTessEndPolygon gluTessEndPolygon}.
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
- *
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessProperty     gluTessProperty
- * @see net.java.games.jogl.GLU#gluTessNormal       gluTessNormal
- * @see net.java.games.jogl.GLU#gluTessEndPolygon   gluTessEndPolygon
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
+ *
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessProperty     gluTessProperty
+ * @see javax.media.opengl.GLU#gluTessNormal       gluTessNormal
+ * @see javax.media.opengl.GLU#gluTessEndPolygon   gluTessEndPolygon
  ****************************************************************************/
 public void gluTessBeginContour(GLUtesselator tesselator);
 
 
 /*****************************************************************************
  * <b>gluTessBeginPolygon</b> and
- * {@link net.java.games.jogl.GLU#gluTessEndPolygon gluTessEndPolygon} delimit
+ * {@link javax.media.opengl.GLU#gluTessEndPolygon gluTessEndPolygon} delimit
  * the definition of a convex, concave or self-intersecting polygon. Within
  * each <b>gluTessBeginPolygon</b>/
- * {@link net.java.games.jogl.GLU#gluTessEndPolygon gluTessEndPolygon} pair,
+ * {@link javax.media.opengl.GLU#gluTessEndPolygon gluTessEndPolygon} pair,
  * there must be one or more calls to
- * {@link net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour}/
- * {@link net.java.games.jogl.GLU#gluTessEndContour gluTessEndContour}. Within
+ * {@link javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour}/
+ * {@link javax.media.opengl.GLU#gluTessEndContour gluTessEndContour}. Within
  * each contour, there are zero or more calls to
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex}. The vertices
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex}. The vertices
  * specify a closed contour (the last vertex of each contour is automatically
- * linked to the first). See the {@link net.java.games.jogl.GLU#gluTessVertex
- * gluTessVertex}, {@link net.java.games.jogl.GLU#gluTessBeginContour
- * gluTessBeginContour}, and {@link net.java.games.jogl.GLU#gluTessEndContour
+ * linked to the first). See the {@link javax.media.opengl.GLU#gluTessVertex
+ * gluTessVertex}, {@link javax.media.opengl.GLU#gluTessBeginContour
+ * gluTessBeginContour}, and {@link javax.media.opengl.GLU#gluTessEndContour
  * gluTessEndContour} reference pages for more details.<P>
  *
  * <b>data</b> is a reference to a user-defined data structure. If the
  * appropriate callback(s) are specified (see
- * {@link net.java.games.jogl.GLU#gluTessCallback gluTessCallback}), then this
+ * {@link javax.media.opengl.GLU#gluTessCallback gluTessCallback}), then this
  * reference is returned to the callback method(s). Thus, it is a convenient
  * way to store per-polygon information.<P>
  *
- * Once {@link net.java.games.jogl.GLU#gluTessEndPolygon gluTessEndPolygon} is
+ * Once {@link javax.media.opengl.GLU#gluTessEndPolygon gluTessEndPolygon} is
  * called, the polygon is tessellated, and the resulting triangles are
  * described through callbacks. See
- * {@link net.java.games.jogl.GLU#gluTessCallback gluTessCallback} for
+ * {@link javax.media.opengl.GLU#gluTessCallback gluTessCallback} for
  * descriptions of the callback methods.
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
  * @param data
  *        Specifies a reference to user polygon data.
  *
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessProperty     gluTessProperty
- * @see net.java.games.jogl.GLU#gluTessNormal       gluTessNormal
- * @see net.java.games.jogl.GLU#gluTessEndPolygon   gluTessEndPolygon
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessProperty     gluTessProperty
+ * @see javax.media.opengl.GLU#gluTessNormal       gluTessNormal
+ * @see javax.media.opengl.GLU#gluTessEndPolygon   gluTessEndPolygon
  ****************************************************************************/
 public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
 
@@ -320,12 +320,12 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  * callback with user-specified polygon data will be used. Note that the
  * polygonData parameter used by some of the methods is a copy of the
  * reference that was specified when
- * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  * was called. The legal callbacks are as follows:<P>
  *
  * <b>GLU_TESS_BEGIN</b>
  * <UL>
- *   The begin callback is invoked like {@link net.java.games.jogl.GL#glBegin
+ *   The begin callback is invoked like {@link javax.media.opengl.GL#glBegin
  *   glBegin} to indicate the start of a (triangle) primitive. The method
  *   takes a single argument of type int. If the
  *   <b>GLU_TESS_BOUNDARY_ONLY</b> property is set to <b>GL_FALSE</b>, then
@@ -344,7 +344,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   The same as the <b>GLU_TESS_BEGIN</b> callback except
  *   that it takes an additional reference argument. This reference is
  *   identical to the opaque reference provided when
- *   {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ *   {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  *   was called. The method prototype for this callback is:
  * </UL>
  *
@@ -354,7 +354,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  * <b>GLU_TESS_EDGE_FLAG</b>
  * <UL>
  *   The edge flag callback is similar to
- *   {@link net.java.games.jogl.GL#glEdgeFlag glEdgeFlag}. The method takes
+ *   {@link javax.media.opengl.GL#glEdgeFlag glEdgeFlag}. The method takes
  *   a single boolean boundaryEdge that indicates which edges lie on the
  *   polygon boundary. If the boundaryEdge is <b>GL_TRUE</b>, then each vertex
  *   that follows begins an edge that lies on the polygon boundary, that is,
@@ -379,7 +379,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   The same as the <b>GLU_TESS_EDGE_FLAG</b> callback except that it takes
  *   an additional reference argument. This reference is identical to the
  *   opaque reference provided when
- *   {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ *   {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  *   was called. The method prototype for this callback is:
  * </UL>
  *
@@ -389,12 +389,12 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  * <b>GLU_TESS_VERTEX</b>
  * <UL>
  *   The vertex callback is invoked between the begin and end callbacks. It is
- *   similar to {@link net.java.games.jogl.GL#glVertex3f glVertex3f}, and it
+ *   similar to {@link javax.media.opengl.GL#glVertex3f glVertex3f}, and it
  *   defines the vertices of the triangles created by the tessellation
  *   process. The method takes a reference as its only argument. This
  *   reference is identical to the opaque reference provided by the user when
  *   the vertex was described (see
- *   {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex}). The method
+ *   {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex}). The method
  *   prototype for this callback is:
  * </UL>
  *
@@ -406,7 +406,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   The same as the <b>GLU_TESS_VERTEX</b> callback except that it takes an
  *   additional reference argument. This reference is identical to the opaque
  *   reference provided when
- *   {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ *   {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  *   was called. The method prototype for this callback is:
  * </UL>
  *
@@ -416,7 +416,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  * <b>GLU_TESS_END</b>
  * <UL>
  *   The end callback serves the same purpose as
- *   {@link net.java.games.jogl.GL#glEnd glEnd}. It indicates the end of a
+ *   {@link javax.media.opengl.GL#glEnd glEnd}. It indicates the end of a
  *   primitive and it takes no arguments. The method prototype for this
  *   callback is:
  * </UL>
@@ -429,7 +429,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   The same as the <b>GLU_TESS_END</b> callback except that it takes an
  *   additional reference argument. This reference is identical to the opaque
  *   reference provided when
- *   {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ *   {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  *   was called. The method prototype for this callback is:
  * </UL>
  *
@@ -460,7 +460,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   <i>data</i> and <i>weight</i>, and return the new vertex pointer
  *   in <i>outData</i>. This handle is supplied during rendering callbacks.
  *   The user is responsible for freeing the memory some time after
- *   {@link net.java.games.jogl.GLU#gluTessEndPolygon gluTessEndPolygon} is
+ *   {@link javax.media.opengl.GLU#gluTessEndPolygon gluTessEndPolygon} is
  *   called.<P>
  *
  *   For example, if the polygon lies in an arbitrary plane in 3-space, and a
@@ -508,7 +508,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   The same as the <b>GLU_TESS_COMBINE</b> callback except that it takes an
  *   additional reference argument. This reference is identical to the opaque
  *   reference provided when
- *   {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ *   {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  *   was called. The method prototype for this callback is:
  * </UL>
  *
@@ -527,7 +527,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   <b>GLU_TESS_MISSING_END_CONTOUR</b>, <b>GLU_TESS_COORD_TOO_LARGE</b>,
  *   <b>GLU_TESS_NEED_COMBINE_CALLBACK</b> or <b>GLU_OUT_OF_MEMORY</b>.
  *   Character strings describing these errors can be retrieved with the
- *   {@link net.java.games.jogl.GLU#gluErrorString gluErrorString} call. The
+ *   {@link javax.media.opengl.GLU#gluErrorString gluErrorString} call. The
  *   method prototype for this callback is:
  * </UL>
  *
@@ -553,7 +553,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *   The same as the GLU_TESS_ERROR callback except that it takes an
  *   additional reference argument. This reference is identical to the opaque
  *   reference provided when
- *   {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ *   {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  *   was called. The method prototype for this callback is:
  * </UL>
  *
@@ -562,7 +562,7 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
  * @param which
  *        Specifies the callback being defined. The following values are
  *        valid: <b>GLU_TESS_BEGIN</b>, <b>GLU_TESS_BEGIN_DATA</b>,
@@ -574,16 +574,16 @@ public void gluTessBeginPolygon(GLUtesselator tesselator, Object data);
  * @param aCallback
  *        Specifies the callback object to be called.
  *
- * @see net.java.games.jogl.GL#glBegin              glBegin
- * @see net.java.games.jogl.GL#glEdgeFlag           glEdgeFlag
- * @see net.java.games.jogl.GL#glVertex3f           glVertex3f
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluErrorString      gluErrorString
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour
- * @see net.java.games.jogl.GLU#gluTessProperty     gluTessProperty
- * @see net.java.games.jogl.GLU#gluTessNormal       gluTessNormal
+ * @see javax.media.opengl.GL#glBegin              glBegin
+ * @see javax.media.opengl.GL#glEdgeFlag           glEdgeFlag
+ * @see javax.media.opengl.GL#glVertex3f           glVertex3f
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluErrorString      gluErrorString
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour
+ * @see javax.media.opengl.GLU#gluTessProperty     gluTessProperty
+ * @see javax.media.opengl.GLU#gluTessNormal       gluTessNormal
  ****************************************************************************/
 public void gluTessCallback(GLUtesselator tesselator, int which,
                             GLUtesselatorCallback aCallback);
@@ -591,66 +591,66 @@ public void gluTessCallback(GLUtesselator tesselator, int which,
 
 /*****************************************************************************
  *  <b>gluTessEndContour</b> and
- * {@link net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour}
+ * {@link javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour}
  * delimit the definition of a polygon contour. Within each
- * {@link net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour}/
+ * {@link javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour}/
  * <b>gluTessEndContour</b> pair, there can be zero or more calls to
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex}. The vertices
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex}. The vertices
  * specify a closed contour (the last vertex of each contour is automatically
- * linked to the first). See the {@link net.java.games.jogl.GLU#gluTessVertex
+ * linked to the first). See the {@link javax.media.opengl.GLU#gluTessVertex
  * gluTessVertex} reference page for more details.
- * {@link net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour} can
- * only be called between {@link net.java.games.jogl.GLU#gluTessBeginPolygon
+ * {@link javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour} can
+ * only be called between {@link javax.media.opengl.GLU#gluTessBeginPolygon
  * gluTessBeginPolygon} and
- * {@link net.java.games.jogl.GLU#gluTessEndPolygon gluTessEndPolygon}.
+ * {@link javax.media.opengl.GLU#gluTessEndPolygon gluTessEndPolygon}.
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
- *
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessProperty     gluTessProperty
- * @see net.java.games.jogl.GLU#gluTessNormal       gluTessNormal
- * @see net.java.games.jogl.GLU#gluTessEndPolygon   gluTessEndPolygon
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
+ *
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessProperty     gluTessProperty
+ * @see javax.media.opengl.GLU#gluTessNormal       gluTessNormal
+ * @see javax.media.opengl.GLU#gluTessEndPolygon   gluTessEndPolygon
  ****************************************************************************/
 public void gluTessEndContour(GLUtesselator tesselator);
 
 
 /*****************************************************************************
  * <b>gluTessEndPolygon</b> and
- * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
+ * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon}
  * delimit the definition of a convex, concave or self-intersecting polygon.
- * Within each {@link net.java.games.jogl.GLU#gluTessBeginPolygon
+ * Within each {@link javax.media.opengl.GLU#gluTessBeginPolygon
  * gluTessBeginPolygon}/<b>gluTessEndPolygon</b> pair, there must be one or
- * more calls to {@link net.java.games.jogl.GLU#gluTessBeginContour
- * gluTessBeginContour}/{@link net.java.games.jogl.GLU#gluTessEndContour
+ * more calls to {@link javax.media.opengl.GLU#gluTessBeginContour
+ * gluTessBeginContour}/{@link javax.media.opengl.GLU#gluTessEndContour
  * gluTessEndContour}. Within each contour, there are zero or more calls to
- * {@link net.java.games.jogl.GLU#gluTessVertex gluTessVertex}. The vertices
+ * {@link javax.media.opengl.GLU#gluTessVertex gluTessVertex}. The vertices
  * specify a closed contour (the last vertex of each contour is automatically
- * linked to the first). See the {@link net.java.games.jogl.GLU#gluTessVertex
- * gluTessVertex}, {@link net.java.games.jogl.GLU#gluTessBeginContour
- * gluTessBeginContour} and {@link net.java.games.jogl.GLU#gluTessEndContour
+ * linked to the first). See the {@link javax.media.opengl.GLU#gluTessVertex
+ * gluTessVertex}, {@link javax.media.opengl.GLU#gluTessBeginContour
+ * gluTessBeginContour} and {@link javax.media.opengl.GLU#gluTessEndContour
  * gluTessEndContour} reference pages for more details.<P>
  *
  * Once <b>gluTessEndPolygon</b> is called, the polygon is tessellated, and
  * the resulting triangles are described through callbacks. See
- * {@link net.java.games.jogl.GLU#gluTessCallback gluTessCallback} for
+ * {@link javax.media.opengl.GLU#gluTessCallback gluTessCallback} for
  * descriptions of the callback functions.
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
- *
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour
- * @see net.java.games.jogl.GLU#gluTessVertex       gluTessVertex
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessProperty     gluTessProperty
- * @see net.java.games.jogl.GLU#gluTessNormal       gluTessNormal
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
+ *
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour
+ * @see javax.media.opengl.GLU#gluTessVertex       gluTessVertex
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessProperty     gluTessProperty
+ * @see javax.media.opengl.GLU#gluTessNormal       gluTessNormal
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
  ****************************************************************************/
 public void gluTessEndPolygon(GLUtesselator tesselator);
 
@@ -678,7 +678,7 @@ public void gluTessEndPolygon(GLUtesselator tesselator);
  *
  * @param tesselator
  *        Specifies the tessellation object (created by
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
  * @param x
  *        Specifies the first component of the normal.
  * @param y
@@ -686,8 +686,8 @@ public void gluTessEndPolygon(GLUtesselator tesselator);
  * @param z
  *        Specifies the third component of the normal.
  *
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluTessEndPolygon   gluTessEndPolygon
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluTessEndPolygon   gluTessEndPolygon
  ****************************************************************************/
 public void gluTessNormal(GLUtesselator tesselator, double x, double y, double z);
 
@@ -758,7 +758,7 @@ public void gluTessNormal(GLUtesselator tesselator, double x, double y, double z
  *
  * @param tesselator
  *        Specifies the tessellation object created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}
  * @param which
  *        Specifies the property to be set.  Valid values are
  *        <b>GLU_TESS_WINDING_RULE</b>, <b>GLU_TESS_BOUNDARDY_ONLY</b>,
@@ -766,8 +766,8 @@ public void gluTessNormal(GLUtesselator tesselator, double x, double y, double z
  * @param value
  *        Specifices the value of the indicated property.
  *
- * @see net.java.games.jogl.GLU#gluGetTessProperty gluGetTessProperty
- * @see net.java.games.jogl.GLU#gluNewTess         gluNewTess
+ * @see javax.media.opengl.GLU#gluGetTessProperty gluGetTessProperty
+ * @see javax.media.opengl.GLU#gluNewTess         gluNewTess
  ****************************************************************************/
 public void gluTessProperty(GLUtesselator tesselator, int which, double value);
 
@@ -777,33 +777,33 @@ public void gluTessProperty(GLUtesselator tesselator, int which, double value);
  * defines. Successive <b>gluTessVertex</b> calls describe a closed contour.
  * For example, to describe a quadrilateral <b>gluTessVertex</b> should be
  * called four times. <b>gluTessVertex</b> can only be called between
- * {@link net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour} and
- * {@link net.java.games.jogl.GLU#gluTessBeginContour gluTessEndContour}.<P>
+ * {@link javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour} and
+ * {@link javax.media.opengl.GLU#gluTessBeginContour gluTessEndContour}.<P>
  *
  * <b>data</b> normally references to a structure containing the vertex
  * location, as well as other per-vertex attributes such as color and normal.
  * This reference is passed back to the user through the
  * <b>GLU_TESS_VERTEX</b> or <b>GLU_TESS_VERTEX_DATA</b> callback after
- * tessellation (see the {@link net.java.games.jogl.GLU#gluTessCallback
+ * tessellation (see the {@link javax.media.opengl.GLU#gluTessCallback
  * gluTessCallback} reference page).
  *
  * @param tesselator
  *        Specifies the tessellation object (created with
- *        {@link net.java.games.jogl.GLU#gluNewTess gluNewTess}).
+ *        {@link javax.media.opengl.GLU#gluNewTess gluNewTess}).
  * @param coords
  *        Specifies the coordinates of the vertex.
  * @param data
  *        Specifies an opaque reference passed back to the program with the
  *        vertex callback (as specified by
- *        {@link net.java.games.jogl.GLU#gluTessCallback gluTessCallback}).
- *
- * @see net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon
- * @see net.java.games.jogl.GLU#gluNewTess          gluNewTess
- * @see net.java.games.jogl.GLU#gluTessBeginContour gluTessBeginContour
- * @see net.java.games.jogl.GLU#gluTessCallback     gluTessCallback
- * @see net.java.games.jogl.GLU#gluTessProperty     gluTessProperty
- * @see net.java.games.jogl.GLU#gluTessNormal       gluTessNormal
- * @see net.java.games.jogl.GLU#gluTessEndPolygon   gluTessEndPolygon
+ *        {@link javax.media.opengl.GLU#gluTessCallback gluTessCallback}).
+ *
+ * @see javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon
+ * @see javax.media.opengl.GLU#gluNewTess          gluNewTess
+ * @see javax.media.opengl.GLU#gluTessBeginContour gluTessBeginContour
+ * @see javax.media.opengl.GLU#gluTessCallback     gluTessCallback
+ * @see javax.media.opengl.GLU#gluTessProperty     gluTessProperty
+ * @see javax.media.opengl.GLU#gluTessNormal       gluTessNormal
+ * @see javax.media.opengl.GLU#gluTessEndPolygon   gluTessEndPolygon
  ****************************************************************************/
 public void gluTessVertex(GLUtesselator tesselator, double[] coords, int coords_offset, Object data);
 
diff --git a/make/glx-x11.cfg b/make/glx-x11.cfg
index b385c4d13..882d521b6 100644
--- a/make/glx-x11.cfg
+++ b/make/glx-x11.cfg
@@ -1,6 +1,6 @@
 # This .cfg file is used to generate the interface to the GLX routines
 # used internally by the X11GLContext implementation.
-Package net.java.games.jogl.impl.x11
+Package com.sun.opengl.impl.x11
 JavaClass GLX
 Style allstatic
 Include gl-common-x11.cfg
diff --git a/make/glxext.cfg b/make/glxext.cfg
index 6ee898505..b3186a254 100755
--- a/make/glxext.cfg
+++ b/make/glxext.cfg
@@ -1,9 +1,9 @@
 # This .cfg file is used to generate the interface and implementing
 # class for the GLX extensions.
-Package net.java.games.jogl.impl.x11
+Package com.sun.opengl.impl.x11
 Style InterfaceAndImpl
 JavaClass GLXExt
-ImplPackage net.java.games.jogl.impl.x11
+ImplPackage com.sun.opengl.impl.x11
 ImplJavaClass GLXExtImpl
 Include gl-common-x11.cfg
 
diff --git a/make/jawt-macosx.cfg b/make/jawt-macosx.cfg
index ebdbad734..10097ec65 100644
--- a/make/jawt-macosx.cfg
+++ b/make/jawt-macosx.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the MacOSXOnscreenGLContext.
 Style AllStatic
-Package net.java.games.jogl.impl
+Package com.sun.opengl.impl
 JavaClass JAWTFactory
 JavaOutputDir ../build/gensrc/classes
 NativeOutputDir ../build/gensrc/native/jogl
@@ -20,8 +20,8 @@ CustomCCode #include <jawt.h>
 
 CustomCCode #include </usr/include/machine/types.h>
 
-Import net.java.games.jogl.impl.JAWT_PlatformInfo
-StructPackage JAWT_MacOSXDrawingSurfaceInfo net.java.games.jogl.impl.macosx
+Import com.sun.opengl.impl.JAWT_PlatformInfo
+StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.opengl.impl.macosx
 EmitStruct JAWT_MacOSXDrawingSurfaceInfo
 Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo
 
diff --git a/make/jawt-win32.cfg b/make/jawt-win32.cfg
index 4fe44b085..c8a81ecfd 100644
--- a/make/jawt-win32.cfg
+++ b/make/jawt-win32.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the WindowsOnscreenGLContext.
 Style AllStatic
-Package net.java.games.jogl.impl
+Package com.sun.opengl.impl
 JavaClass JAWTFactory
 JavaOutputDir ..\build\gensrc\classes
 NativeOutputDir ..\build\gensrc\native\jogl
@@ -19,8 +19,8 @@ CustomCCode #if _MSC_VER <= 1200
 CustomCCode typedef int intptr_t;
 CustomCCode #endif
 
-Import net.java.games.jogl.impl.JAWT_PlatformInfo
-StructPackage JAWT_Win32DrawingSurfaceInfo net.java.games.jogl.impl.windows
+Import com.sun.opengl.impl.JAWT_PlatformInfo
+StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.opengl.impl.windows
 EmitStruct JAWT_Win32DrawingSurfaceInfo
 Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo
 CustomJavaCode JAWT_DrawingSurfaceInfo   public JAWT_PlatformInfo platformInfo() {
diff --git a/make/jawt-x11.cfg b/make/jawt-x11.cfg
index 5794ed4e0..d326c2f26 100644
--- a/make/jawt-x11.cfg
+++ b/make/jawt-x11.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the X11OnscreenGLContext.
 Style AllStatic
-Package net.java.games.jogl.impl
+Package com.sun.opengl.impl
 JavaClass JAWTFactory
 JavaOutputDir ../build/gensrc/classes
 NativeOutputDir ../build/gensrc/native/jogl
@@ -14,8 +14,8 @@ IgnoreField JAWT_DrawingSurfaceInfo platformInfo
 IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor
 CustomCCode #include <inttypes.h>
 CustomCCode #include <jawt.h>
-Import net.java.games.jogl.impl.JAWT_PlatformInfo
-StructPackage JAWT_X11DrawingSurfaceInfo net.java.games.jogl.impl.x11
+Import com.sun.opengl.impl.JAWT_PlatformInfo
+StructPackage JAWT_X11DrawingSurfaceInfo com.sun.opengl.impl.x11
 EmitStruct JAWT_X11DrawingSurfaceInfo
 Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo
 
diff --git a/make/wglext.cfg b/make/wglext.cfg
index 58bd2d0fb..bc27252a5 100644
--- a/make/wglext.cfg
+++ b/make/wglext.cfg
@@ -1,9 +1,9 @@
 # This .cfg file is used to generate the interface and implementing
 # class for the WGL extensions.
-Package net.java.games.jogl.impl.windows
+Package com.sun.opengl.impl.windows
 Style InterfaceAndImpl
 JavaClass WGLExt
-ImplPackage net.java.games.jogl.impl.windows
+ImplPackage com.sun.opengl.impl.windows
 ImplJavaClass WGLExtImpl
 Include gl-common-win32.cfg
 
diff --git a/make/wingdi-win32.cfg b/make/wingdi-win32.cfg
index a3c5a5ebb..d5b630a89 100644
--- a/make/wingdi-win32.cfg
+++ b/make/wingdi-win32.cfg
@@ -1,6 +1,6 @@
 # This .cfg file is used to generate the interface to the wgl routines
 # used internally by the WindowsGLContext implementation.
-Package net.java.games.jogl.impl.windows
+Package com.sun.opengl.impl.windows
 JavaOutputDir ..\build\gensrc\classes
 NativeOutputDir ..\build\gensrc\native\jogl
 JavaClass WGL
diff --git a/src/net/java/games/gluegen/ArrayTypes.java b/src/classes/com/sun/gluegen/ArrayTypes.java
index 1a75f7306..7e5dd9597 100644
--- a/src/net/java/games/gluegen/ArrayTypes.java
+++ b/src/classes/com/sun/gluegen/ArrayTypes.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/gluegen/CMethodBindingEmitter.java b/src/classes/com/sun/gluegen/CMethodBindingEmitter.java
index 4a7ad1c98..d0e6045ba 100644
--- a/src/net/java/games/gluegen/CMethodBindingEmitter.java
+++ b/src/classes/com/sun/gluegen/CMethodBindingEmitter.java
@@ -37,13 +37,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.util.*;
 import java.io.*;
 import java.text.MessageFormat;
 
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 /** Emits the C-side component of the Java<->C JNI binding. */
 public class CMethodBindingEmitter extends FunctionEmitter
diff --git a/src/net/java/games/gluegen/CodeGenUtils.java b/src/classes/com/sun/gluegen/CodeGenUtils.java
index b89994cdf..553ef26b3 100644
--- a/src/net/java/games/gluegen/CodeGenUtils.java
+++ b/src/classes/com/sun/gluegen/CodeGenUtils.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.io.*;
 import java.util.*;
@@ -94,7 +94,7 @@ public class CodeGenUtils
       w.print(imports[i]);
       w.println(';');
     }
-    w.println("import net.java.games.gluegen.runtime.*;");
+    w.println("import com.sun.gluegen.runtime.*;");
 
     w.println();
 
diff --git a/src/net/java/games/gluegen/CommentEmitter.java b/src/classes/com/sun/gluegen/CommentEmitter.java
index 10256acba..30004f8bc 100644
--- a/src/net/java/games/gluegen/CommentEmitter.java
+++ b/src/classes/com/sun/gluegen/CommentEmitter.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.io.*;
 
diff --git a/src/net/java/games/gluegen/DebugEmitter.java b/src/classes/com/sun/gluegen/DebugEmitter.java
index c8e8b3869..bbcde0e0d 100644
--- a/src/net/java/games/gluegen/DebugEmitter.java
+++ b/src/classes/com/sun/gluegen/DebugEmitter.java
@@ -37,11 +37,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.util.*;
 
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 /** Debug emitter which prints the parsing results to standard output. */
 
diff --git a/src/net/java/games/gluegen/FunctionEmitter.java b/src/classes/com/sun/gluegen/FunctionEmitter.java
index 77a79b6fc..baf08b93a 100644
--- a/src/net/java/games/gluegen/FunctionEmitter.java
+++ b/src/classes/com/sun/gluegen/FunctionEmitter.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.util.*;
 import java.io.*;
diff --git a/src/net/java/games/gluegen/GlueEmitter.java b/src/classes/com/sun/gluegen/GlueEmitter.java
index 00147dfd2..d6f5fede8 100644
--- a/src/net/java/games/gluegen/GlueEmitter.java
+++ b/src/classes/com/sun/gluegen/GlueEmitter.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.util.*;
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 /** Specifies the interface by which GlueGen requests glue code to be
     generated. Can be replaced to generate glue code for other
diff --git a/src/net/java/games/gluegen/GlueEmitterControls.java b/src/classes/com/sun/gluegen/GlueEmitterControls.java
index 4f5d3a8d3..46ff9fd91 100644
--- a/src/net/java/games/gluegen/GlueEmitterControls.java
+++ b/src/classes/com/sun/gluegen/GlueEmitterControls.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 /** Specifies the interface by which a GlueEmitter can request
     additional information from the glue generator. */
diff --git a/src/net/java/games/gluegen/GlueGen.java b/src/classes/com/sun/gluegen/GlueGen.java
index dd810572d..c192ae8cd 100644
--- a/src/net/java/games/gluegen/GlueGen.java
+++ b/src/classes/com/sun/gluegen/GlueGen.java
@@ -37,16 +37,16 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.io.*;
 import java.util.*;
 
 import antlr.*;
 import antlr.collections.*;
-import net.java.games.gluegen.cgram.*;
-import net.java.games.gluegen.cgram.types.*;
-import net.java.games.gluegen.pcpp.*;
+import com.sun.gluegen.cgram.*;
+import com.sun.gluegen.cgram.types.*;
+import com.sun.gluegen.pcpp.*;
 
 /** Glue code generator for C functions and data structures. */
 
@@ -316,8 +316,8 @@ public class GlueGen implements GlueEmitterControls {
     System.out.println("passing input through minimal pseudo-C-preprocessor. Use -I");
     System.out.println("command-line arguments to specify the search path for #includes.");
     System.out.println("Emitter class name can be specified with -E option: i.e.,");
-    System.out.println("-Enet.java.games.gluegen.JavaEmitter (the default). Use");
-    System.out.println("-Enet.java.games.gluegen.DebugEmitter to print recognized entities");
+    System.out.println("-Ecom.sun.gluegen.JavaEmitter (the default). Use");
+    System.out.println("-Ecom.sun.gluegen.DebugEmitter to print recognized entities");
     System.out.println("(#define directives to constant numbers, typedefs, and function");
     System.out.println("declarations) to standard output. Emitter-specific configuration");
     System.out.println("file or files can be specified with -C option; e.g,");
diff --git a/src/net/java/games/gluegen/JavaConfiguration.java b/src/classes/com/sun/gluegen/JavaConfiguration.java
index 51e22f7d6..5c6eece05 100644
--- a/src/net/java/games/gluegen/JavaConfiguration.java
+++ b/src/classes/com/sun/gluegen/JavaConfiguration.java
@@ -37,13 +37,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.io.*;
 import java.util.*;
 import java.util.regex.*;
 
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 /** Parses and provides access to the contents of .cfg files for the
     JavaEmitter. */
diff --git a/src/net/java/games/gluegen/JavaEmitter.java b/src/classes/com/sun/gluegen/JavaEmitter.java
index e260da992..fff0660bd 100644
--- a/src/net/java/games/gluegen/JavaEmitter.java
+++ b/src/classes/com/sun/gluegen/JavaEmitter.java
@@ -37,13 +37,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.io.*;
 import java.util.*;
 import java.text.MessageFormat;
 
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 // PROBLEMS:
 //  - what if something returns 'const int *'? Could we
@@ -680,7 +680,7 @@ public class JavaEmitter implements GlueEmitter {
     writer.println();
     writer.println("import java.nio.*;");
     writer.println();
-    writer.println("import net.java.games.gluegen.runtime.*;");
+    writer.println("import com.sun.gluegen.runtime.*;");
     writer.println();
     List/*<String>*/ imports = cfg.imports();
     for (Iterator iter = imports.iterator(); iter.hasNext(); ) {
diff --git a/src/net/java/games/gluegen/JavaMethodBindingEmitter.java b/src/classes/com/sun/gluegen/JavaMethodBindingEmitter.java
index 8c5cd2caf..c4b9c49bd 100644
--- a/src/net/java/games/gluegen/JavaMethodBindingEmitter.java
+++ b/src/classes/com/sun/gluegen/JavaMethodBindingEmitter.java
@@ -37,14 +37,14 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.io.*;
 import java.util.*;
 import java.text.MessageFormat;
 
-import net.java.games.gluegen.cgram.types.*;
-import net.java.games.gluegen.cgram.*;
+import com.sun.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.*;
 
 /**
  * An emitter that emits only the interface for a Java<->C JNI binding.
diff --git a/src/net/java/games/gluegen/JavaType.java b/src/classes/com/sun/gluegen/JavaType.java
index 18c9c301d..7860a9a09 100644
--- a/src/net/java/games/gluegen/JavaType.java
+++ b/src/classes/com/sun/gluegen/JavaType.java
@@ -37,11 +37,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.nio.*;
 
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 /**
  * Describes a java-side representation of a type that is used to represent
diff --git a/src/net/java/games/gluegen/MethodBinding.java b/src/classes/com/sun/gluegen/MethodBinding.java
index 7576ec3f8..90d25da17 100644
--- a/src/net/java/games/gluegen/MethodBinding.java
+++ b/src/classes/com/sun/gluegen/MethodBinding.java
@@ -37,11 +37,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.util.*;
 
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 /** Represents the binding of a C function to a Java method. Also used
     to represent calls through function pointers contained in
diff --git a/src/net/java/games/gluegen/ReferencedStructs.java b/src/classes/com/sun/gluegen/ReferencedStructs.java
index 824346be8..6c0dfb401 100644
--- a/src/net/java/games/gluegen/ReferencedStructs.java
+++ b/src/classes/com/sun/gluegen/ReferencedStructs.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 import java.util.*;
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 public class ReferencedStructs implements TypeVisitor {
   private Set results = new HashSet();
diff --git a/src/net/java/games/gluegen/StructLayout.java b/src/classes/com/sun/gluegen/StructLayout.java
index da0f4f4f8..a7dbab61f 100644
--- a/src/net/java/games/gluegen/StructLayout.java
+++ b/src/classes/com/sun/gluegen/StructLayout.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.cgram.types.*;
 
 public class StructLayout {
   private int baseOffset;
diff --git a/src/net/java/games/gluegen/TypeInfo.java b/src/classes/com/sun/gluegen/TypeInfo.java
index 60146fa48..437fa8564 100644
--- a/src/net/java/games/gluegen/TypeInfo.java
+++ b/src/classes/com/sun/gluegen/TypeInfo.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen;
+package com.sun.gluegen;
 
 /** Utility class for handling Opaque directives for JavaEmitter. */
 
diff --git a/src/net/java/games/gluegen/ant/GlueGenTask.java b/src/classes/com/sun/gluegen/ant/GlueGenTask.java
index c9849c29d..b90009883 100644
--- a/src/net/java/games/gluegen/ant/GlueGenTask.java
+++ b/src/classes/com/sun/gluegen/ant/GlueGenTask.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.ant;
+package com.sun.gluegen.ant;
 
 /*
  * GlueGenTask.java
@@ -60,7 +60,7 @@ import org.apache.tools.ant.util.JavaEnvUtils;
 
 /**
  * <p>An <a href="http://ant.apache.org">ANT</a> {@link org.apache.tools.ant.Task}
- * for using {@link net.java.games.gluegen.GlueGen}.</p>
+ * for using {@link com.sun.gluegen.GlueGen}.</p>
  * 
  * <p>Usage:</p>
  * <pre>
@@ -80,14 +80,14 @@ import org.apache.tools.ant.util.JavaEnvUtils;
 public class GlueGenTask extends Task
 {
     /**
-     * <p>The {@link net.java.games.gluegen.GlueGen} classname.</p>
+     * <p>The {@link com.sun.gluegen.GlueGen} classname.</p>
      */
-    private static final String GLUE_GEN = "net.java.games.gluegen.GlueGen";
+    private static final String GLUE_GEN = "com.sun.gluegen.GlueGen";
     
     // =========================================================================
     /**
      * <p>The {@link org.apache.tools.ant.types.CommandlineJava} that is used
-     * to execute {@link net.java.games.gluegen.GlueGen}.</p>
+     * to execute {@link com.sun.gluegen.GlueGen}.</p>
      */
     private CommandlineJava gluegenCommandline;
 
@@ -304,7 +304,7 @@ public class GlueGenTask extends Task
     }
 
     /**
-     * <p>Add an optional classpath that defines the location of {@link net.java.games.gluegen.GlueGen}
+     * <p>Add an optional classpath that defines the location of {@link com.sun.gluegen.GlueGen}
      * and <code>GlueGen</code>'s dependencies.</p>
      * 
      * @returns {@link org.apache.tools.ant.types.Path}
@@ -466,7 +466,7 @@ public class GlueGenTask extends Task
     }
 
     /** 
-     * <p>Execute {@link net.java.games.gluegen.GlueGen} in a forked JVM.</p>
+     * <p>Execute {@link com.sun.gluegen.GlueGen} in a forked JVM.</p>
      * 
      * @throws BuildException
      */
diff --git a/src/net/java/games/gluegen/ant/StaticGLGenTask.java b/src/classes/com/sun/gluegen/ant/StaticGLGenTask.java
index 35ed2d504..255ab8a1a 100644
--- a/src/net/java/games/gluegen/ant/StaticGLGenTask.java
+++ b/src/classes/com/sun/gluegen/ant/StaticGLGenTask.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.ant;
+package com.sun.gluegen.ant;
 
 /*
  * StaticGLGenTask.java
@@ -55,7 +55,7 @@ import org.apache.tools.ant.util.JavaEnvUtils;
 
 /**
  * <p>An <a href="http://ant.apache.org">ANT</a> {@link org.apache.tools.ant.Task}
- * for using {@link net.java.games.gluegen.opengl.BuildStaticGLInfo}.</p>
+ * for using {@link com.sun.gluegen.opengl.BuildStaticGLInfo}.</p>
  * 
  * <p>Usage:</p>
  * <pre>
@@ -70,14 +70,14 @@ import org.apache.tools.ant.util.JavaEnvUtils;
 public class StaticGLGenTask extends Task
 {
     /**
-     * <p>The {@link net.java.games.gluegen.opengl.BuildStaticGLInfo} classname.</p>
+     * <p>The {@link com.sun.gluegen.opengl.BuildStaticGLInfo} classname.</p>
      */
-    private static final String GL_GEN = "net.java.games.gluegen.opengl.BuildStaticGLInfo";
+    private static final String GL_GEN = "com.sun.gluegen.opengl.BuildStaticGLInfo";
     
     // =========================================================================
     /**
      * <p>The {@link org.apache.tools.ant.types.CommandlineJava} that is used
-     * to execute {@link net.java.games.gluegen.opengl.BuildStaticGLInfo}.</p>
+     * to execute {@link com.sun.gluegen.opengl.BuildStaticGLInfo}.</p>
      */
     private CommandlineJava glgenCommandline;
 
@@ -170,7 +170,7 @@ public class StaticGLGenTask extends Task
     }
 
     /**
-     * <p>Add an optional classpath that defines the location of {@link net.java.games.gluegen.opengl.BuildStaticGLInfo}
+     * <p>Add an optional classpath that defines the location of {@link com.sun.gluegen.opengl.BuildStaticGLInfo}
      * and <code>BuildStaticGLInfo</code>'s dependencies.</p>
      * 
      * @returns {@link org.apache.tools.ant.types.Path}
@@ -274,7 +274,7 @@ public class StaticGLGenTask extends Task
     }
 
     /** 
-     * <p>Execute {@link net.java.games.gluegen.opengl.BuildStaticGLInfo} in a 
+     * <p>Execute {@link com.sun.gluegen.opengl.BuildStaticGLInfo} in a 
      * forked JVM.</p>
      * 
      * @throws BuildException
diff --git a/src/net/java/games/gluegen/cgram/CSymbolTable.java b/src/classes/com/sun/gluegen/cgram/CSymbolTable.java
index e22274b90..51edf44c3 100644
--- a/src/net/java/games/gluegen/cgram/CSymbolTable.java
+++ b/src/classes/com/sun/gluegen/cgram/CSymbolTable.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.cgram;
+package com.sun.gluegen.cgram;
 
 import java.util.Vector;
 import java.util.Hashtable;
diff --git a/src/net/java/games/gluegen/cgram/CToken.java b/src/classes/com/sun/gluegen/cgram/CToken.java
index facd95a08..5d85c48c7 100644
--- a/src/net/java/games/gluegen/cgram/CToken.java
+++ b/src/classes/com/sun/gluegen/cgram/CToken.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.cgram;
+package com.sun.gluegen.cgram;
 
 import antlr.CommonToken;
 
diff --git a/src/net/java/games/gluegen/cgram/Define.java b/src/classes/com/sun/gluegen/cgram/Define.java
index 9fbd8636d..a71c538bb 100644
--- a/src/net/java/games/gluegen/cgram/Define.java
+++ b/src/classes/com/sun/gluegen/cgram/Define.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram;
+package com.sun.gluegen.cgram;
 
 /** Represents a #define of a literal to a value (a number represented
     in string form.) */
diff --git a/src/net/java/games/gluegen/cgram/GnuCEmitter.g b/src/classes/com/sun/gluegen/cgram/GnuCEmitter.g
index 87294fc53..82003c3a0 100644
--- a/src/net/java/games/gluegen/cgram/GnuCEmitter.g
+++ b/src/classes/com/sun/gluegen/cgram/GnuCEmitter.g
@@ -17,7 +17,7 @@ DESCRIPTION:
 
 
 header {
-        package net.java.games.gluegen.cgram;
+        package com.sun.gluegen.cgram;
 
         import java.io.*;
         import java.util.*;
diff --git a/src/net/java/games/gluegen/cgram/GnuCParser.g b/src/classes/com/sun/gluegen/cgram/GnuCParser.g
index feed4518e..c90e01179 100644
--- a/src/net/java/games/gluegen/cgram/GnuCParser.g
+++ b/src/classes/com/sun/gluegen/cgram/GnuCParser.g
@@ -17,7 +17,7 @@ DESCRIPTION:
 
     
 header {
-        package net.java.games.gluegen.cgram;
+        package com.sun.gluegen.cgram;
 
         import java.io.*;
 
diff --git a/src/net/java/games/gluegen/cgram/GnuCTreeParser.g b/src/classes/com/sun/gluegen/cgram/GnuCTreeParser.g
index 8400e3e59..5231dee17 100644
--- a/src/net/java/games/gluegen/cgram/GnuCTreeParser.g
+++ b/src/classes/com/sun/gluegen/cgram/GnuCTreeParser.g
@@ -17,7 +17,7 @@ DESCRIPTION:
 
 
 header {
-        package net.java.games.gluegen.cgram;
+        package com.sun.gluegen.cgram;
 
         import java.io.*;
 
diff --git a/src/net/java/games/gluegen/cgram/HeaderParser.g b/src/classes/com/sun/gluegen/cgram/HeaderParser.g
index 1263c30b8..212e56091 100644
--- a/src/net/java/games/gluegen/cgram/HeaderParser.g
+++ b/src/classes/com/sun/gluegen/cgram/HeaderParser.g
@@ -38,13 +38,13 @@
  */
 
 header {
-        package net.java.games.gluegen.cgram;
+        package com.sun.gluegen.cgram;
 
         import java.io.*;
         import java.util.*;
 
         import antlr.CommonAST;
-        import net.java.games.gluegen.cgram.types.*;
+        import com.sun.gluegen.cgram.types.*;
 }
 
 class HeaderParser extends GnuCTreeParser;
diff --git a/src/net/java/games/gluegen/cgram/LineObject.java b/src/classes/com/sun/gluegen/cgram/LineObject.java
index 578e14194..0ed470c92 100644
--- a/src/net/java/games/gluegen/cgram/LineObject.java
+++ b/src/classes/com/sun/gluegen/cgram/LineObject.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.cgram;
+package com.sun.gluegen.cgram;
 
 class LineObject {
   LineObject parent = null;
diff --git a/src/net/java/games/gluegen/cgram/PreprocessorInfoChannel.java b/src/classes/com/sun/gluegen/cgram/PreprocessorInfoChannel.java
index f2de592c7..431af91d3 100644
--- a/src/net/java/games/gluegen/cgram/PreprocessorInfoChannel.java
+++ b/src/classes/com/sun/gluegen/cgram/PreprocessorInfoChannel.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.cgram;
+package com.sun.gluegen.cgram;
 
 import java.util.*;
 
diff --git a/src/net/java/games/gluegen/cgram/StdCParser.g b/src/classes/com/sun/gluegen/cgram/StdCParser.g
index 65f7468bf..e84fbfd6e 100644
--- a/src/net/java/games/gluegen/cgram/StdCParser.g
+++ b/src/classes/com/sun/gluegen/cgram/StdCParser.g
@@ -47,7 +47,7 @@ TODO:
 
 
 header {
-        package net.java.games.gluegen.cgram;
+        package com.sun.gluegen.cgram;
 
         import java.io.*;
 
diff --git a/src/net/java/games/gluegen/cgram/TNode.java b/src/classes/com/sun/gluegen/cgram/TNode.java
index 2a93b939c..f5b2c17e2 100644
--- a/src/net/java/games/gluegen/cgram/TNode.java
+++ b/src/classes/com/sun/gluegen/cgram/TNode.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.cgram;
+package com.sun.gluegen.cgram;
 
 import antlr.collections.AST;
 import antlr.CommonAST;
diff --git a/src/net/java/games/gluegen/cgram/TNodeFactory.java b/src/classes/com/sun/gluegen/cgram/TNodeFactory.java
index 8cda2cfa9..452363263 100644
--- a/src/net/java/games/gluegen/cgram/TNodeFactory.java
+++ b/src/classes/com/sun/gluegen/cgram/TNodeFactory.java
@@ -1,4 +1,4 @@
-package net.java.games.gluegen.cgram;
+package com.sun.gluegen.cgram;
 
 import antlr.Token;
 import antlr.ASTFactory;
diff --git a/src/net/java/games/gluegen/cgram/types/ArrayType.java b/src/classes/com/sun/gluegen/cgram/types/ArrayType.java
index 1a73284e7..c61e6457f 100644
--- a/src/net/java/games/gluegen/cgram/types/ArrayType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/ArrayType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 /** Represents an array type. This differs from a pointer type in C
     syntax by the use of "[]" rather than "*". The length may or may
diff --git a/src/net/java/games/gluegen/cgram/types/BitType.java b/src/classes/com/sun/gluegen/cgram/types/BitType.java
index 915f847f8..293eb3969 100644
--- a/src/net/java/games/gluegen/cgram/types/BitType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/BitType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 /** Represents a bitfield in a struct. */
 
diff --git a/src/net/java/games/gluegen/cgram/types/CVAttributes.java b/src/classes/com/sun/gluegen/cgram/types/CVAttributes.java
index 481a7be00..589904b36 100644
--- a/src/net/java/games/gluegen/cgram/types/CVAttributes.java
+++ b/src/classes/com/sun/gluegen/cgram/types/CVAttributes.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 /** Enumeration for const/volatile attributes. These are passed in to
     the constructor of the type. */
diff --git a/src/net/java/games/gluegen/cgram/types/CompoundType.java b/src/classes/com/sun/gluegen/cgram/types/CompoundType.java
index 4c8c2d9ac..6ad7580e0 100644
--- a/src/net/java/games/gluegen/cgram/types/CompoundType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/CompoundType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 import java.util.*;
 
diff --git a/src/net/java/games/gluegen/cgram/types/CompoundTypeKind.java b/src/classes/com/sun/gluegen/cgram/types/CompoundTypeKind.java
index eedabfd2f..8df12ac7f 100644
--- a/src/net/java/games/gluegen/cgram/types/CompoundTypeKind.java
+++ b/src/classes/com/sun/gluegen/cgram/types/CompoundTypeKind.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 /** Type-safe enum for discriminating between structs and unions,
     which are both represented as compound types. */
diff --git a/src/net/java/games/gluegen/cgram/types/DoubleType.java b/src/classes/com/sun/gluegen/cgram/types/DoubleType.java
index 3d0ca6fe1..e2be470fb 100644
--- a/src/net/java/games/gluegen/cgram/types/DoubleType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/DoubleType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 /** Represents a double-word floating-point type (C type "double".) */
 
diff --git a/src/net/java/games/gluegen/cgram/types/EnumType.java b/src/classes/com/sun/gluegen/cgram/types/EnumType.java
index 4ddd1e514..7f4b9e559 100644
--- a/src/net/java/games/gluegen/cgram/types/EnumType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/EnumType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 import java.util.*;
 
diff --git a/src/net/java/games/gluegen/cgram/types/Field.java b/src/classes/com/sun/gluegen/cgram/types/Field.java
index a2ea44363..3514c8f7e 100644
--- a/src/net/java/games/gluegen/cgram/types/Field.java
+++ b/src/classes/com/sun/gluegen/cgram/types/Field.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 /** Represents a field in a struct or union. */
 
diff --git a/src/net/java/games/gluegen/cgram/types/FloatType.java b/src/classes/com/sun/gluegen/cgram/types/FloatType.java
index 8b81e0c3f..9f59b3564 100644
--- a/src/net/java/games/gluegen/cgram/types/FloatType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/FloatType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 /** Represents a single-word floating-point type (C type "float".) */
 
diff --git a/src/net/java/games/gluegen/cgram/types/FunctionSymbol.java b/src/classes/com/sun/gluegen/cgram/types/FunctionSymbol.java
index ab72dfb83..50ee8ccff 100644
--- a/src/net/java/games/gluegen/cgram/types/FunctionSymbol.java
+++ b/src/classes/com/sun/gluegen/cgram/types/FunctionSymbol.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 import java.util.*;
 
diff --git a/src/net/java/games/gluegen/cgram/types/FunctionType.java b/src/classes/com/sun/gluegen/cgram/types/FunctionType.java
index 5d309a83f..9c94daea2 100644
--- a/src/net/java/games/gluegen/cgram/types/FunctionType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/FunctionType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 import java.util.*;
 
diff --git a/src/net/java/games/gluegen/cgram/types/IntType.java b/src/classes/com/sun/gluegen/cgram/types/IntType.java
index 50223af11..2816c561c 100644
--- a/src/net/java/games/gluegen/cgram/types/IntType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/IntType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public class IntType extends PrimitiveType {
   private boolean unsigned;
diff --git a/src/net/java/games/gluegen/cgram/types/MachineDescription.java b/src/classes/com/sun/gluegen/cgram/types/MachineDescription.java
index 7acb919bc..41923979b 100644
--- a/src/net/java/games/gluegen/cgram/types/MachineDescription.java
+++ b/src/classes/com/sun/gluegen/cgram/types/MachineDescription.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public class MachineDescription {
   private int charSizeInBytes;
diff --git a/src/net/java/games/gluegen/cgram/types/MachineDescription32Bit.java b/src/classes/com/sun/gluegen/cgram/types/MachineDescription32Bit.java
index fca7edce7..1dbbb700c 100644
--- a/src/net/java/games/gluegen/cgram/types/MachineDescription32Bit.java
+++ b/src/classes/com/sun/gluegen/cgram/types/MachineDescription32Bit.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public class MachineDescription32Bit extends MachineDescription {
   public MachineDescription32Bit() {
diff --git a/src/net/java/games/gluegen/cgram/types/MachineDescription64Bit.java b/src/classes/com/sun/gluegen/cgram/types/MachineDescription64Bit.java
index 4ef78639b..00d581266 100644
--- a/src/net/java/games/gluegen/cgram/types/MachineDescription64Bit.java
+++ b/src/classes/com/sun/gluegen/cgram/types/MachineDescription64Bit.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public class MachineDescription64Bit extends MachineDescription {
   public MachineDescription64Bit() {
diff --git a/src/net/java/games/gluegen/cgram/types/PointerType.java b/src/classes/com/sun/gluegen/cgram/types/PointerType.java
index ffe369761..142a2f12d 100644
--- a/src/net/java/games/gluegen/cgram/types/PointerType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/PointerType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public class PointerType extends Type {
   private Type targetType;
diff --git a/src/net/java/games/gluegen/cgram/types/PrimitiveType.java b/src/classes/com/sun/gluegen/cgram/types/PrimitiveType.java
index 405f1016d..8807e2615 100644
--- a/src/net/java/games/gluegen/cgram/types/PrimitiveType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/PrimitiveType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public abstract class PrimitiveType extends Type {
   protected PrimitiveType(String name, int size, int cvAttributes) {
diff --git a/src/net/java/games/gluegen/cgram/types/Type.java b/src/classes/com/sun/gluegen/cgram/types/Type.java
index 6c0ea9f79..2ac492d3f 100644
--- a/src/net/java/games/gluegen/cgram/types/Type.java
+++ b/src/classes/com/sun/gluegen/cgram/types/Type.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 import java.util.List;
 
diff --git a/src/net/java/games/gluegen/cgram/types/TypeDictionary.java b/src/classes/com/sun/gluegen/cgram/types/TypeDictionary.java
index 3909919aa..5c74455cb 100644
--- a/src/net/java/games/gluegen/cgram/types/TypeDictionary.java
+++ b/src/classes/com/sun/gluegen/cgram/types/TypeDictionary.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 import java.util.*;
 
diff --git a/src/net/java/games/gluegen/cgram/types/TypeVisitor.java b/src/classes/com/sun/gluegen/cgram/types/TypeVisitor.java
index 4679327d1..88f7dd544 100644
--- a/src/net/java/games/gluegen/cgram/types/TypeVisitor.java
+++ b/src/classes/com/sun/gluegen/cgram/types/TypeVisitor.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public interface TypeVisitor {
   public void visitType(Type t);
diff --git a/src/net/java/games/gluegen/cgram/types/VoidType.java b/src/classes/com/sun/gluegen/cgram/types/VoidType.java
index 00130b708..db4c43f81 100644
--- a/src/net/java/games/gluegen/cgram/types/VoidType.java
+++ b/src/classes/com/sun/gluegen/cgram/types/VoidType.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.cgram.types;
+package com.sun.gluegen.cgram.types;
 
 public class VoidType extends Type {
   public VoidType(int cvAttributes) {
diff --git a/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java b/src/classes/com/sun/gluegen/opengl/BuildComposablePipeline.java
index 5c971ab8f..5235631be 100644
--- a/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java
+++ b/src/classes/com/sun/gluegen/opengl/BuildComposablePipeline.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.opengl;
+package com.sun.gluegen.opengl;
 
-import net.java.games.gluegen.*;
+import com.sun.gluegen.*;
 
 import java.lang.reflect.*;
 import java.io.*;
diff --git a/src/net/java/games/gluegen/opengl/BuildStaticGLInfo.java b/src/classes/com/sun/gluegen/opengl/BuildStaticGLInfo.java
index 867197e03..86da5c1c3 100644
--- a/src/net/java/games/gluegen/opengl/BuildStaticGLInfo.java
+++ b/src/classes/com/sun/gluegen/opengl/BuildStaticGLInfo.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.opengl;
+package com.sun.gluegen.opengl;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/net/java/games/gluegen/opengl/CGLPAWrapperEmitter.java b/src/classes/com/sun/gluegen/opengl/CGLPAWrapperEmitter.java
index ceee9f1be..eedc6b229 100644
--- a/src/net/java/games/gluegen/opengl/CGLPAWrapperEmitter.java
+++ b/src/classes/com/sun/gluegen/opengl/CGLPAWrapperEmitter.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.opengl;
+package com.sun.gluegen.opengl;
 
 import java.io.*;
 import java.util.*;
-import net.java.games.gluegen.*;
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.*;
+import com.sun.gluegen.cgram.types.*;
 
 public class CGLPAWrapperEmitter extends CMethodBindingEmitter {
   private static final CommentEmitter defaultCommentEmitter =
diff --git a/src/net/java/games/gluegen/opengl/ConvertFromGL4Java.java b/src/classes/com/sun/gluegen/opengl/ConvertFromGL4Java.java
index 428aba110..2f051a78b 100644
--- a/src/net/java/games/gluegen/opengl/ConvertFromGL4Java.java
+++ b/src/classes/com/sun/gluegen/opengl/ConvertFromGL4Java.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.opengl;
+package com.sun.gluegen.opengl;
 
 import java.io.*;
 
@@ -62,7 +62,7 @@ public class ConvertFromGL4Java {
       String trimmed = line.trim();
       boolean isImport = false;
       if (trimmed.startsWith("import gl4java")) {
-        line = "import net.java.games.jogl.*;";
+        line = "import javax.media.opengl.*;";
         isImport = true;
       }
       if (!isImport ||
diff --git a/src/net/java/games/gluegen/opengl/GLEmitter.java b/src/classes/com/sun/gluegen/opengl/GLEmitter.java
index e6c44bd4d..994926ecd 100644
--- a/src/net/java/games/gluegen/opengl/GLEmitter.java
+++ b/src/classes/com/sun/gluegen/opengl/GLEmitter.java
@@ -37,14 +37,14 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.opengl;
+package com.sun.gluegen.opengl;
 
 import java.io.*;
 import java.text.MessageFormat;
 import java.util.*;
-import net.java.games.gluegen.*;
-import net.java.games.gluegen.cgram.types.*;
-import net.java.games.gluegen.runtime.*;
+import com.sun.gluegen.*;
+import com.sun.gluegen.cgram.types.*;
+import com.sun.gluegen.runtime.*;
 
 /**
  * A subclass of JavaEmitter that modifies the normal emission of C and Java
@@ -338,7 +338,7 @@ public class GLEmitter extends JavaEmitter
     w.println("   * and therefore does not have a valid GL procedure address. ");
     w.println("   */");
     w.println("  public long getAddressFor(String glFunctionName) {");   
-    w.println("   String addressFieldName = net.java.games.gluegen.opengl.GLEmitter.PROCADDRESS_VAR_PREFIX + glFunctionName;");
+    w.println("   String addressFieldName = com.sun.gluegen.opengl.GLEmitter.PROCADDRESS_VAR_PREFIX + glFunctionName;");
     w.println("   try { ");
     w.println("      java.lang.reflect.Field addressField = this.getClass().getField(addressFieldName);");
     w.println("      return addressField.getLong(this);");
diff --git a/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java b/src/classes/com/sun/gluegen/opengl/JavaGLPAWrapperEmitter.java
index 51f5579f4..eccdf9333 100644
--- a/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java
+++ b/src/classes/com/sun/gluegen/opengl/JavaGLPAWrapperEmitter.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.opengl;
+package com.sun.gluegen.opengl;
 
 import java.io.*;
 import java.util.*;
-import net.java.games.gluegen.*;
-import net.java.games.gluegen.cgram.types.*;
+import com.sun.gluegen.*;
+import com.sun.gluegen.cgram.types.*;
 
 public class JavaGLPAWrapperEmitter extends JavaMethodBindingEmitter {
   private final CommentEmitter commentEmitterForWrappedMethod =
diff --git a/src/net/java/games/gluegen/pcpp/PCPP.java b/src/classes/com/sun/gluegen/pcpp/PCPP.java
index 51fa8f9bf..a2d3ab09b 100644
--- a/src/net/java/games/gluegen/pcpp/PCPP.java
+++ b/src/classes/com/sun/gluegen/pcpp/PCPP.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.pcpp;
+package com.sun.gluegen.pcpp;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/net/java/games/gluegen/runtime/BufferFactory.java b/src/classes/com/sun/gluegen/runtime/BufferFactory.java
index 81334b77a..ca66e6915 100644
--- a/src/net/java/games/gluegen/runtime/BufferFactory.java
+++ b/src/classes/com/sun/gluegen/runtime/BufferFactory.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.runtime;
+package com.sun.gluegen.runtime;
 
 import java.nio.*;
-import net.java.games.jogl.util.BufferUtils;
+import com.sun.opengl.utils.BufferUtils;
 
 public class BufferFactory {
 
diff --git a/src/net/java/games/gluegen/runtime/ProcAddressHelper.java b/src/classes/com/sun/gluegen/runtime/ProcAddressHelper.java
index f98ae0c2b..4d40fd487 100644
--- a/src/net/java/games/gluegen/runtime/ProcAddressHelper.java
+++ b/src/classes/com/sun/gluegen/runtime/ProcAddressHelper.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.runtime;
+package com.sun.gluegen.runtime;
 
 /** Contains constants used in glue code generation. */
 
diff --git a/src/net/java/games/gluegen/runtime/StructAccessor.java b/src/classes/com/sun/gluegen/runtime/StructAccessor.java
index 581eb7202..5a0fa5d25 100644
--- a/src/net/java/games/gluegen/runtime/StructAccessor.java
+++ b/src/classes/com/sun/gluegen/runtime/StructAccessor.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.gluegen.runtime;
+package com.sun.gluegen.runtime;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/cg/CgException.java b/src/classes/com/sun/opengl/cg/CgException.java
index 341ba3dbf..3380bb540 100644
--- a/src/net/java/games/cg/CgException.java
+++ b/src/classes/com/sun/opengl/cg/CgException.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.cg;
+package com.sun.opengl.cg;
 
 /**
  * A generic exception for errors that occur throughout the NVidia Cg
diff --git a/src/net/java/games/jogl/impl/Debug.java b/src/classes/com/sun/opengl/impl/Debug.java
index 164c5afbd..9a2a8fb17 100755..100644
--- a/src/net/java/games/jogl/impl/Debug.java
+++ b/src/classes/com/sun/opengl/impl/Debug.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.security.*;
-import net.java.games.jogl.Version;
+import javax.media.opengl.Version;
 
 /** Helper routines for logging and debugging. */
 
diff --git a/src/net/java/games/jogl/impl/FunctionAvailabilityCache.java b/src/classes/com/sun/opengl/impl/FunctionAvailabilityCache.java
index 87f2b1819..585a5cde5 100644
--- a/src/net/java/games/jogl/impl/FunctionAvailabilityCache.java
+++ b/src/classes/com/sun/opengl/impl/FunctionAvailabilityCache.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 import java.util.*;
 import java.awt.Canvas;
 import java.awt.Graphics;
diff --git a/src/net/java/games/jogl/impl/GLContextImpl.java b/src/classes/com/sun/opengl/impl/GLContextImpl.java
index 7be7a81af..da4fade89 100755..100644
--- a/src/net/java/games/jogl/impl/GLContextImpl.java
+++ b/src/classes/com/sun/opengl/impl/GLContextImpl.java
@@ -37,13 +37,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.awt.Component;
 import java.nio.*;
 
-import net.java.games.jogl.*;
-import net.java.games.gluegen.runtime.*;
+import javax.media.opengl.*;
+import com.sun.gluegen.runtime.*;
 
 public abstract class GLContextImpl extends GLContext {
   protected GLContextLock lock = new GLContextLock();
@@ -245,7 +245,7 @@ public abstract class GLContextImpl extends GLContext {
    *
    * @param glFunctionName the name of the OpenGL function (e.g., use
    * "glPolygonOffsetEXT" to check if the {@link
-   * net.java.games.jogl.GL#glPolygonOffsetEXT(float,float)} is available).
+   * javax.media.opengl.GL#glPolygonOffsetEXT(float,float)} is available).
    */
   protected boolean isFunctionAvailable(String glFunctionName) {
     return functionAvailability.isFunctionAvailable(mapToRealGLFunctionName(glFunctionName));
diff --git a/src/net/java/games/jogl/impl/GLContextLock.java b/src/classes/com/sun/opengl/impl/GLContextLock.java
index 7e40cbe46..7668678b7 100755..100644
--- a/src/net/java/games/jogl/impl/GLContextLock.java
+++ b/src/classes/com/sun/opengl/impl/GLContextLock.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /** Implements the makeCurrent / release locking behavior of the
     GLContext class. When "fail fast mode" is enabled, attempts to
diff --git a/src/net/java/games/jogl/impl/GLContextShareSet.java b/src/classes/com/sun/opengl/impl/GLContextShareSet.java
index f2e1c595a..a797ae69c 100644
--- a/src/net/java/games/jogl/impl/GLContextShareSet.java
+++ b/src/classes/com/sun/opengl/impl/GLContextShareSet.java
@@ -37,11 +37,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.lang.ref.*;
 import java.util.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /** Provides a mechanism by which OpenGL contexts can share textures
     and display lists in the face of multithreading and asynchronous
diff --git a/src/net/java/games/jogl/impl/GLDrawableFactoryImpl.java b/src/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
index b8c6a126c..62f4664ab 100755..100644
--- a/src/net/java/games/jogl/impl/GLDrawableFactoryImpl.java
+++ b/src/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
@@ -37,13 +37,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.awt.Component;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
-import net.java.games.gluegen.runtime.*; // for PROCADDRESS_VAR_PREFIX
-import net.java.games.jogl.*;
+import com.sun.gluegen.runtime.*; // for PROCADDRESS_VAR_PREFIX
+import javax.media.opengl.*;
 
 /** Extends GLDrawableFactory with a few methods for handling
     typically software-accelerated offscreen rendering (Device
diff --git a/src/net/java/games/jogl/impl/GLDrawableHelper.java b/src/classes/com/sun/opengl/impl/GLDrawableHelper.java
index 317372cf2..014e35f7e 100644
--- a/src/net/java/games/jogl/impl/GLDrawableHelper.java
+++ b/src/classes/com/sun/opengl/impl/GLDrawableHelper.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.util.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /** Encapsulates the implementation of most of the GLAutoDrawable's
     methods to be able to share it between GLCanvas and GLJPanel. */
diff --git a/src/net/java/games/jogl/impl/GLDrawableImpl.java b/src/classes/com/sun/opengl/impl/GLDrawableImpl.java
index 60a7e3fcf..f93ed9663 100644
--- a/src/net/java/games/jogl/impl/GLDrawableImpl.java
+++ b/src/classes/com/sun/opengl/impl/GLDrawableImpl.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 public abstract class GLDrawableImpl implements GLDrawable {
   /** For offscreen GLDrawables (pbuffers and "pixmap" drawables),
diff --git a/src/net/java/games/jogl/impl/GLPbufferImpl.java b/src/classes/com/sun/opengl/impl/GLPbufferImpl.java
index 35a8ac79f..008cfe3b9 100644
--- a/src/net/java/games/jogl/impl/GLPbufferImpl.java
+++ b/src/classes/com/sun/opengl/impl/GLPbufferImpl.java
@@ -37,14 +37,14 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.event.*;
 import java.beans.PropertyChangeListener;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /** Platform-independent class exposing pbuffer functionality to
     applications. This class is not exposed in the public API as it
diff --git a/src/net/java/games/jogl/impl/GLUquadricImpl.java b/src/classes/com/sun/opengl/impl/GLUquadricImpl.java
index dfc167dcb..2ccea0d46 100755..100644
--- a/src/net/java/games/jogl/impl/GLUquadricImpl.java
+++ b/src/classes/com/sun/opengl/impl/GLUquadricImpl.java
@@ -103,9 +103,9 @@
  * facility.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /**
  * GLUquadricImpl.java
diff --git a/src/net/java/games/jogl/impl/InternalBufferUtils.java b/src/classes/com/sun/opengl/impl/InternalBufferUtils.java
index 7ae5efb0e..89639c493 100644
--- a/src/net/java/games/jogl/impl/InternalBufferUtils.java
+++ b/src/classes/com/sun/opengl/impl/InternalBufferUtils.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/JAWT_PlatformInfo.java b/src/classes/com/sun/opengl/impl/JAWT_PlatformInfo.java
index 55eb43d42..ca101eff9 100644
--- a/src/net/java/games/jogl/impl/JAWT_PlatformInfo.java
+++ b/src/classes/com/sun/opengl/impl/JAWT_PlatformInfo.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 /** Marker class for all window system-specific JAWT data structures. */
 
diff --git a/src/net/java/games/jogl/impl/NativeLibLoader.java b/src/classes/com/sun/opengl/impl/NativeLibLoader.java
index 31fec96a2..fa535c7d5 100644
--- a/src/net/java/games/jogl/impl/NativeLibLoader.java
+++ b/src/classes/com/sun/opengl/impl/NativeLibLoader.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.awt.Toolkit;
 import java.security.*;
diff --git a/src/net/java/games/jogl/impl/Project.java b/src/classes/com/sun/opengl/impl/Project.java
index 6138a4108..6d78db411 100755
--- a/src/net/java/games/jogl/impl/Project.java
+++ b/src/classes/com/sun/opengl/impl/Project.java
@@ -102,12 +102,12 @@
  * in the design, construction, operation or maintenance of any nuclear
  * facility.
  */
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.nio.*;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.util.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /**
  * Project.java
diff --git a/src/net/java/games/jogl/impl/SingleThreadedWorkaround.java b/src/classes/com/sun/opengl/impl/SingleThreadedWorkaround.java
index 6019cea9c..aef550cc7 100755..100644
--- a/src/net/java/games/jogl/impl/SingleThreadedWorkaround.java
+++ b/src/classes/com/sun/opengl/impl/SingleThreadedWorkaround.java
@@ -37,14 +37,14 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.awt.EventQueue;
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /** Encapsulates the workaround of running all display operations on
     the AWT event queue thread for the purposes of working around
diff --git a/src/net/java/games/jogl/impl/Util.java b/src/classes/com/sun/opengl/impl/Util.java
index 712da596b..b4b501659 100755..100644
--- a/src/net/java/games/jogl/impl/Util.java
+++ b/src/classes/com/sun/opengl/impl/Util.java
@@ -66,10 +66,10 @@
  * facility.
  */
 
-package net.java.games.jogl.impl;
+package com.sun.opengl.impl;
 
 import java.nio.IntBuffer;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /**
  * Util.java
diff --git a/src/net/java/games/jogl/impl/error/Error.java b/src/classes/com/sun/opengl/impl/error/Error.java
index a9b4c48f1..ded83c9cd 100644
--- a/src/net/java/games/jogl/impl/error/Error.java
+++ b/src/classes/com/sun/opengl/impl/error/Error.java
@@ -32,11 +32,11 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.error;
+package com.sun.opengl.impl.error;
 
-import net.java.games.jogl.GL;
-import net.java.games.jogl.GLU;
-import net.java.games.jogl.impl.GLUImpl;
+import javax.media.opengl.GL;
+import javax.media.opengl.GLU;
+import com.sun.opengl.impl.GLUImpl;
 
 /**
  *
diff --git a/src/net/java/games/jogl/impl/glue/Glue.java b/src/classes/com/sun/opengl/impl/glue/Glue.java
index 65ba2ad9d..5938f6e0d 100644
--- a/src/net/java/games/jogl/impl/glue/Glue.java
+++ b/src/classes/com/sun/opengl/impl/glue/Glue.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.glue;
+package com.sun.opengl.impl.glue;
 
 /**
  *
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXDummyGLContext.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXDummyGLContext.java
index f8934c06a..fef5584ab 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXDummyGLContext.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXDummyGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 /** This MacOSXGLContext implementation provides interoperability with
     the NSOpenGLView Cocoa widget. The MacOSXGLImpl can be
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXGLContext.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLContext.java
index 37abcd40f..e7b06e32e 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXGLContext.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLContext.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
 import java.nio.*;
 import java.util.*;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public abstract class MacOSXGLContext extends GLContextImpl
 {	
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawable.java
index b139678db..26ea8ec54 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawable.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
 import java.awt.Component;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public abstract class MacOSXGLDrawable extends GLDrawableImpl {
   protected static final boolean DEBUG = Debug.debug("MacOSXGLDrawable");
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXGLDrawableFactory.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawableFactory.java
index 1c649e279..274db9013 100755..100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXGLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawableFactory.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
 import java.awt.Component;
 import java.awt.EventQueue;
@@ -46,8 +46,8 @@ import java.awt.GraphicsDevice;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class MacOSXGLDrawableFactory extends GLDrawableFactoryImpl {
   static {
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLContext.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXOffscreenGLContext.java
index 797ba2459..c1d106da8 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLContext.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXOffscreenGLContext.java
@@ -37,11 +37,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
 import java.awt.image.BufferedImage;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class MacOSXOffscreenGLContext extends MacOSXPbufferGLContext
 {  
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXOffscreenGLDrawable.java
index 1118680ca..f478f43fc 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXOffscreenGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class MacOSXOffscreenGLDrawable extends MacOSXPbufferGLDrawable {
 
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLContext.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLContext.java
index 6accb37c0..9e20dd6dd 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLContext.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLContext.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
 import java.util.*;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class MacOSXOnscreenGLContext extends MacOSXGLContext {
   protected MacOSXOnscreenGLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLDrawable.java
index ad95a9b37..e7f6537b9 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLDrawable.java
@@ -37,15 +37,15 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
 import java.awt.Component;
 import java.lang.ref.WeakReference;
 import java.security.*;
 import java.util.*;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class MacOSXOnscreenGLDrawable extends MacOSXGLDrawable {
   public static final int LOCK_SURFACE_NOT_READY = 1;
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLContext.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLContext.java
index b9d8dbf52..048a256ea 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLContext.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLContext.java
@@ -1,10 +1,10 @@
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
 import java.security.*;
 import java.util.*;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class MacOSXPbufferGLContext extends MacOSXGLContext {
   protected MacOSXPbufferGLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLDrawable.java
index 282d8a08b..038b1d759 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.macosx;
+package com.sun.opengl.impl.macosx;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class MacOSXPbufferGLDrawable extends MacOSXGLDrawable {
   private static final boolean DEBUG = Debug.debug("MacOSXPbufferGLContext");
diff --git a/src/net/java/games/jogl/impl/mipmap/BuildMipmap.java b/src/classes/com/sun/opengl/impl/mipmap/BuildMipmap.java
index 06a6a02bc..93f76bd58 100644
--- a/src/net/java/games/jogl/impl/mipmap/BuildMipmap.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/BuildMipmap.java
@@ -32,11 +32,11 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
-import net.java.games.jogl.GL;
-import net.java.games.jogl.GLU;
-import net.java.games.jogl.impl.Debug;
+import javax.media.opengl.GL;
+import javax.media.opengl.GLU;
+import com.sun.opengl.impl.Debug;
 import java.nio.*;
 import java.io.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract.java b/src/classes/com/sun/opengl/impl/mipmap/Extract.java
index c78bcd9ce..12362011e 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract1010102.java b/src/classes/com/sun/opengl/impl/mipmap/Extract1010102.java
index d6fcc5977..d337e5dcd 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract1010102.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract1010102.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract1555rev.java b/src/classes/com/sun/opengl/impl/mipmap/Extract1555rev.java
index 10a132417..1b8372e84 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract1555rev.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract1555rev.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract2101010rev.java b/src/classes/com/sun/opengl/impl/mipmap/Extract2101010rev.java
index 5d98f19a7..adef3d58d 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract2101010rev.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract2101010rev.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract233rev.java b/src/classes/com/sun/opengl/impl/mipmap/Extract233rev.java
index 46d45cbcb..1a3e9582e 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract233rev.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract233rev.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract332.java b/src/classes/com/sun/opengl/impl/mipmap/Extract332.java
index 6a3bcdc0a..e925a2cc1 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract332.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract332.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract4444.java b/src/classes/com/sun/opengl/impl/mipmap/Extract4444.java
index c2b5fc95f..b4dff1b72 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract4444.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract4444.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract4444rev.java b/src/classes/com/sun/opengl/impl/mipmap/Extract4444rev.java
index e8adf3004..761d057b1 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract4444rev.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract4444rev.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract5551.java b/src/classes/com/sun/opengl/impl/mipmap/Extract5551.java
index b7e3a027b..047298152 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract5551.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract5551.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract565.java b/src/classes/com/sun/opengl/impl/mipmap/Extract565.java
index 43158bb6c..c9346ecf6 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract565.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract565.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract565rev.java b/src/classes/com/sun/opengl/impl/mipmap/Extract565rev.java
index b6f3af966..9b0596b3f 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract565rev.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract565rev.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract8888.java b/src/classes/com/sun/opengl/impl/mipmap/Extract8888.java
index c013fae28..9f57bc39e 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract8888.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract8888.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract8888rev.java b/src/classes/com/sun/opengl/impl/mipmap/Extract8888rev.java
index 9104ed7b1..2c0d90595 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract8888rev.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Extract8888rev.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractFloat.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractFloat.java
index 3dad2de29..b1a0ee51e 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractFloat.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractFloat.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractPrimitive.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractPrimitive.java
index 242d8f331..4ba6f734e 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractPrimitive.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractPrimitive.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractSByte.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractSByte.java
index f925eb7bd..f8cfcda2e 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractSByte.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractSByte.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractSInt.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractSInt.java
index c874c82f1..5411f6daa 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractSInt.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractSInt.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractSShort.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractSShort.java
index 73a0f9c5e..ace44b3a9 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractSShort.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractSShort.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractUByte.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractUByte.java
index 031aa74ce..0c0a2716b 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractUByte.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractUByte.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractUInt.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractUInt.java
index b80afd41e..feba26f96 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractUInt.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractUInt.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/ExtractUShort.java b/src/classes/com/sun/opengl/impl/mipmap/ExtractUShort.java
index 130f2c833..1b7abd70b 100644
--- a/src/net/java/games/jogl/impl/mipmap/ExtractUShort.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ExtractUShort.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/mipmap/HalveImage.java b/src/classes/com/sun/opengl/impl/mipmap/HalveImage.java
index ea12577b9..5e854c13d 100644
--- a/src/net/java/games/jogl/impl/mipmap/HalveImage.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/HalveImage.java
@@ -32,9 +32,9 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
-import net.java.games.jogl.GL;
+import javax.media.opengl.GL;
 import java.nio.*;
 
 /**
diff --git a/src/net/java/games/jogl/impl/mipmap/Image.java b/src/classes/com/sun/opengl/impl/mipmap/Image.java
index 1ea3b1f52..777434586 100644
--- a/src/net/java/games/jogl/impl/mipmap/Image.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Image.java
@@ -32,9 +32,9 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
-import net.java.games.jogl.GL;
+import javax.media.opengl.GL;
 import java.nio.*;
 
 /**
diff --git a/src/net/java/games/jogl/impl/mipmap/Mipmap.java b/src/classes/com/sun/opengl/impl/mipmap/Mipmap.java
index c80d25a12..864c86f2a 100644
--- a/src/net/java/games/jogl/impl/mipmap/Mipmap.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Mipmap.java
@@ -32,11 +32,11 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
-import net.java.games.jogl.GL;
-import net.java.games.jogl.GLU;
-import net.java.games.jogl.GLException;
+import javax.media.opengl.GL;
+import javax.media.opengl.GLU;
+import javax.media.opengl.GLException;
 import java.nio.*;
 
 /**
diff --git a/src/net/java/games/jogl/impl/mipmap/PixelStorageModes.java b/src/classes/com/sun/opengl/impl/mipmap/PixelStorageModes.java
index cc3b4ed47..990e4b90a 100644
--- a/src/net/java/games/jogl/impl/mipmap/PixelStorageModes.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/PixelStorageModes.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 /**
  *
diff --git a/src/net/java/games/jogl/impl/mipmap/ScaleInternal.java b/src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java
index 06c8e582f..fe0da7dfe 100644
--- a/src/net/java/games/jogl/impl/mipmap/ScaleInternal.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java
@@ -32,10 +32,10 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
-import net.java.games.jogl.GLU;
-import net.java.games.jogl.GL;
+import javax.media.opengl.GLU;
+import javax.media.opengl.GL;
 import java.nio.*;
 
 /**
diff --git a/src/net/java/games/jogl/impl/mipmap/Type_Widget.java b/src/classes/com/sun/opengl/impl/mipmap/Type_Widget.java
index f749d5348..0431748e9 100644
--- a/src/net/java/games/jogl/impl/mipmap/Type_Widget.java
+++ b/src/classes/com/sun/opengl/impl/mipmap/Type_Widget.java
@@ -32,7 +32,7 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.mipmap;
+package com.sun.opengl.impl.mipmap;
 
 import java.nio.*;
 
diff --git a/src/net/java/games/jogl/impl/nurbs/README-PORTING.txt b/src/classes/com/sun/opengl/impl/nurbs/README-PORTING.txt
index df5f41782..df5f41782 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/README-PORTING.txt
+++ b/src/classes/com/sun/opengl/impl/nurbs/README-PORTING.txt
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/Arc.java b/src/classes/com/sun/opengl/impl/nurbs/internals/Arc.java
index 076c68b72..076c68b72 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/Arc.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/Arc.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/ArcTesselator.java b/src/classes/com/sun/opengl/impl/nurbs/internals/ArcTesselator.java
index cb77dfbd0..cb77dfbd0 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/ArcTesselator.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/ArcTesselator.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/Backend.java b/src/classes/com/sun/opengl/impl/nurbs/internals/Backend.java
index e99822f0b..e99822f0b 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/Backend.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/Backend.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/BasicCurveEvaluator.java b/src/classes/com/sun/opengl/impl/nurbs/internals/BasicCurveEvaluator.java
index 3aae3674b..3aae3674b 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/BasicCurveEvaluator.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/BasicCurveEvaluator.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/BasicSurfaceEvaluator.java b/src/classes/com/sun/opengl/impl/nurbs/internals/BasicSurfaceEvaluator.java
index f2b4a6679..f2b4a6679 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/BasicSurfaceEvaluator.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/BasicSurfaceEvaluator.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/BezierArc.java b/src/classes/com/sun/opengl/impl/nurbs/internals/BezierArc.java
index feac7d544..feac7d544 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/BezierArc.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/BezierArc.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/Bin.java b/src/classes/com/sun/opengl/impl/nurbs/internals/Bin.java
index 55bec5eae..55bec5eae 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/Bin.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/Bin.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/CachingEvaluator.java b/src/classes/com/sun/opengl/impl/nurbs/internals/CachingEvaluator.java
index c9c8c5cf9..c9c8c5cf9 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/CachingEvaluator.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/CachingEvaluator.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/Defines.java b/src/classes/com/sun/opengl/impl/nurbs/internals/Defines.java
index fc284abbd..fc284abbd 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/Defines.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/Defines.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/NurbsConsts.java b/src/classes/com/sun/opengl/impl/nurbs/internals/NurbsConsts.java
index 74c9c150c..74c9c150c 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/NurbsConsts.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/NurbsConsts.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/NurbsException.java b/src/classes/com/sun/opengl/impl/nurbs/internals/NurbsException.java
index 5453807cd..5453807cd 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/NurbsException.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/NurbsException.java
diff --git a/src/net/java/games/jogl/impl/nurbs/internals/Subdivider.java b/src/classes/com/sun/opengl/impl/nurbs/internals/Subdivider.java
index 155b6b7ac..155b6b7ac 100755..100644
--- a/src/net/java/games/jogl/impl/nurbs/internals/Subdivider.java
+++ b/src/classes/com/sun/opengl/impl/nurbs/internals/Subdivider.java
diff --git a/src/net/java/games/jogl/impl/registry/Registry.java b/src/classes/com/sun/opengl/impl/registry/Registry.java
index ef9f868f3..41b3046b9 100644
--- a/src/net/java/games/jogl/impl/registry/Registry.java
+++ b/src/classes/com/sun/opengl/impl/registry/Registry.java
@@ -32,10 +32,10 @@
  * compliant with the OpenGL(R) version 1.2.1 Specification.
  */
 
-package net.java.games.jogl.impl.registry;
+package com.sun.opengl.impl.registry;
 
 import java.util.regex.*;
-import net.java.games.jogl.GLU;
+import javax.media.opengl.GLU;
 
 /**
  *
diff --git a/src/net/java/games/jogl/impl/tesselator/ActiveRegion.java b/src/classes/com/sun/opengl/impl/tesselator/ActiveRegion.java
index a3b3f953a..f62f02ca9 100644
--- a/src/net/java/games/jogl/impl/tesselator/ActiveRegion.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/ActiveRegion.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class ActiveRegion {
     GLUhalfEdge eUp;		/* upper edge, directed right to left */
diff --git a/src/net/java/games/jogl/impl/tesselator/CachedVertex.java b/src/classes/com/sun/opengl/impl/tesselator/CachedVertex.java
index 3f8661d78..3fe36d84f 100644
--- a/src/net/java/games/jogl/impl/tesselator/CachedVertex.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/CachedVertex.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class CachedVertex {
     public double[] coords = new double[3];
diff --git a/src/net/java/games/jogl/impl/tesselator/Dict.java b/src/classes/com/sun/opengl/impl/tesselator/Dict.java
index 6d3d80d0c..03e85cf23 100644
--- a/src/net/java/games/jogl/impl/tesselator/Dict.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/Dict.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class Dict {
     DictNode head;
diff --git a/src/net/java/games/jogl/impl/tesselator/DictNode.java b/src/classes/com/sun/opengl/impl/tesselator/DictNode.java
index da870b6d9..f5b73318c 100644
--- a/src/net/java/games/jogl/impl/tesselator/DictNode.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/DictNode.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class DictNode {
     Object key;
diff --git a/src/net/java/games/jogl/impl/tesselator/GLUface.java b/src/classes/com/sun/opengl/impl/tesselator/GLUface.java
index fa2449a5a..6fbcf84ed 100644
--- a/src/net/java/games/jogl/impl/tesselator/GLUface.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/GLUface.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class GLUface {
     public GLUface next;		/* next face (never NULL) */
diff --git a/src/net/java/games/jogl/impl/tesselator/GLUhalfEdge.java b/src/classes/com/sun/opengl/impl/tesselator/GLUhalfEdge.java
index 8e2abcb78..71627f262 100644
--- a/src/net/java/games/jogl/impl/tesselator/GLUhalfEdge.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/GLUhalfEdge.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 
 
@@ -50,10 +50,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 net.java.games.jogl.impl.tesselator.GLUface Lface;		/* left face */
+    public com.sun.opengl.impl.tesselator.GLUface Lface;		/* left face */
 
     /* Internal data (keep hidden) */
-    public net.java.games.jogl.impl.tesselator.ActiveRegion activeRegion;	/* a region with this upper edge (sweep.c) */
+    public com.sun.opengl.impl.tesselator.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/net/java/games/jogl/impl/tesselator/GLUmesh.java b/src/classes/com/sun/opengl/impl/tesselator/GLUmesh.java
index 0ab3b2626..35ebe441b 100644
--- a/src/net/java/games/jogl/impl/tesselator/GLUmesh.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/GLUmesh.java
@@ -40,13 +40,13 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 
 
 class GLUmesh {
     GLUvertex vHead = new GLUvertex();		/* dummy header for vertex list */
-    net.java.games.jogl.impl.tesselator.GLUface fHead = new GLUface();		/* dummy header for face list */
-    net.java.games.jogl.impl.tesselator.GLUhalfEdge eHead = new GLUhalfEdge(true);		/* dummy header for edge list */
-    net.java.games.jogl.impl.tesselator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false);	/* and its symmetric counterpart */
+    com.sun.opengl.impl.tesselator.GLUface fHead = new GLUface();		/* dummy header for face list */
+    com.sun.opengl.impl.tesselator.GLUhalfEdge eHead = new GLUhalfEdge(true);		/* dummy header for edge list */
+    com.sun.opengl.impl.tesselator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false);	/* and its symmetric counterpart */
 }
diff --git a/src/net/java/games/jogl/impl/tesselator/GLUtesselatorImpl.java b/src/classes/com/sun/opengl/impl/tesselator/GLUtesselatorImpl.java
index 34638ba51..69581c21b 100644
--- a/src/net/java/games/jogl/impl/tesselator/GLUtesselatorImpl.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/GLUtesselatorImpl.java
@@ -40,10 +40,10 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.tesselator.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.tesselator.*;
 
 public class GLUtesselatorImpl implements GLUtesselator {
     public static final int TESS_MAX_CACHE = 100;
diff --git a/src/net/java/games/jogl/impl/tesselator/GLUvertex.java b/src/classes/com/sun/opengl/impl/tesselator/GLUvertex.java
index 6497aa2d7..27758340e 100644
--- a/src/net/java/games/jogl/impl/tesselator/GLUvertex.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/GLUvertex.java
@@ -40,12 +40,12 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class GLUvertex {
     public GLUvertex next;		/* next vertex (never NULL) */
     public GLUvertex prev;		/* previous vertex (never NULL) */
-    public net.java.games.jogl.impl.tesselator.GLUhalfEdge anEdge;	/* a half-edge with this origin */
+    public com.sun.opengl.impl.tesselator.GLUhalfEdge anEdge;	/* a half-edge with this origin */
     public Object data;		/* client's data */
 
     /* Internal data (keep hidden) */
diff --git a/src/net/java/games/jogl/impl/tesselator/Geom.java b/src/classes/com/sun/opengl/impl/tesselator/Geom.java
index 9693b3a48..a1db61469 100644
--- a/src/net/java/games/jogl/impl/tesselator/Geom.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/Geom.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class Geom {
     private Geom() {
diff --git a/src/net/java/games/jogl/impl/tesselator/Mesh.java b/src/classes/com/sun/opengl/impl/tesselator/Mesh.java
index 4eee1f8ac..4401eac33 100644
--- a/src/net/java/games/jogl/impl/tesselator/Mesh.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/Mesh.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class Mesh {
     private Mesh() {
@@ -51,19 +51,19 @@ class Mesh {
  * No vertex or face structures are allocated, but these must be assigned
  * before the current edge operation is completed.
  */
-    static net.java.games.jogl.impl.tesselator.GLUhalfEdge MakeEdge(net.java.games.jogl.impl.tesselator.GLUhalfEdge eNext) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eSym;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge ePrev;
+    static com.sun.opengl.impl.tesselator.GLUhalfEdge MakeEdge(com.sun.opengl.impl.tesselator.GLUhalfEdge eNext) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eSym;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge ePrev;
 
 //        EdgePair * pair = (EdgePair *)
 //        memAlloc(sizeof(EdgePair));
 //        if (pair == NULL) return NULL;
 //
 //        e = &pair - > e;
-        e = new net.java.games.jogl.impl.tesselator.GLUhalfEdge(true);
+        e = new com.sun.opengl.impl.tesselator.GLUhalfEdge(true);
 //        eSym = &pair - > eSym;
-        eSym = new net.java.games.jogl.impl.tesselator.GLUhalfEdge(false);
+        eSym = new com.sun.opengl.impl.tesselator.GLUhalfEdge(false);
 
 
         /* Make sure eNext points to the first edge of the edge pair */
@@ -105,9 +105,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(net.java.games.jogl.impl.tesselator.GLUhalfEdge a, net.java.games.jogl.impl.tesselator.GLUhalfEdge b) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge aOnext = a.Onext;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge bOnext = b.Onext;
+    static void Splice(com.sun.opengl.impl.tesselator.GLUhalfEdge a, com.sun.opengl.impl.tesselator.GLUhalfEdge b) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge aOnext = a.Onext;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge bOnext = b.Onext;
 
         aOnext.Sym.Lnext = b;
         bOnext.Sym.Lnext = a;
@@ -121,11 +121,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(net.java.games.jogl.impl.tesselator.GLUvertex newVertex,
-                           net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrig, net.java.games.jogl.impl.tesselator.GLUvertex vNext) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
-        net.java.games.jogl.impl.tesselator.GLUvertex vPrev;
-        net.java.games.jogl.impl.tesselator.GLUvertex vNew = newVertex;
+    static void MakeVertex(com.sun.opengl.impl.tesselator.GLUvertex newVertex,
+                           com.sun.opengl.impl.tesselator.GLUhalfEdge eOrig, com.sun.opengl.impl.tesselator.GLUvertex vNext) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
+        com.sun.opengl.impl.tesselator.GLUvertex vPrev;
+        com.sun.opengl.impl.tesselator.GLUvertex vNew = newVertex;
 
         assert (vNew != null);
 
@@ -154,10 +154,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(net.java.games.jogl.impl.tesselator.GLUface newFace, net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrig, net.java.games.jogl.impl.tesselator.GLUface fNext) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
-        net.java.games.jogl.impl.tesselator.GLUface fPrev;
-        net.java.games.jogl.impl.tesselator.GLUface fNew = newFace;
+    static void MakeFace(com.sun.opengl.impl.tesselator.GLUface newFace, com.sun.opengl.impl.tesselator.GLUhalfEdge eOrig, com.sun.opengl.impl.tesselator.GLUface fNext) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
+        com.sun.opengl.impl.tesselator.GLUface fPrev;
+        com.sun.opengl.impl.tesselator.GLUface fNew = newFace;
 
         assert (fNew != null);
 
@@ -189,8 +189,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(net.java.games.jogl.impl.tesselator.GLUhalfEdge eDel) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge ePrev, eNext;
+    static void KillEdge(com.sun.opengl.impl.tesselator.GLUhalfEdge eDel) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge ePrev, eNext;
 
         /* Half-edges are allocated in pairs, see EdgePair above */
         if (!eDel.first) {
@@ -208,9 +208,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(net.java.games.jogl.impl.tesselator.GLUvertex vDel, net.java.games.jogl.impl.tesselator.GLUvertex newOrg) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e, eStart = vDel.anEdge;
-        net.java.games.jogl.impl.tesselator.GLUvertex vPrev, vNext;
+    static void KillVertex(com.sun.opengl.impl.tesselator.GLUvertex vDel, com.sun.opengl.impl.tesselator.GLUvertex newOrg) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e, eStart = vDel.anEdge;
+        com.sun.opengl.impl.tesselator.GLUvertex vPrev, vNext;
 
         /* change the origin of all affected edges */
         e = eStart;
@@ -229,9 +229,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(net.java.games.jogl.impl.tesselator.GLUface fDel, net.java.games.jogl.impl.tesselator.GLUface newLface) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e, eStart = fDel.anEdge;
-        net.java.games.jogl.impl.tesselator.GLUface fPrev, fNext;
+    static void KillFace(com.sun.opengl.impl.tesselator.GLUface fDel, com.sun.opengl.impl.tesselator.GLUface newLface) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e, eStart = fDel.anEdge;
+        com.sun.opengl.impl.tesselator.GLUface fPrev, fNext;
 
         /* change the left face of all affected edges */
         e = eStart;
@@ -253,11 +253,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 net.java.games.jogl.impl.tesselator.GLUhalfEdge __gl_meshMakeEdge(net.java.games.jogl.impl.tesselator.GLUmesh mesh) {
-        net.java.games.jogl.impl.tesselator.GLUvertex newVertex1 = new net.java.games.jogl.impl.tesselator.GLUvertex();
-        net.java.games.jogl.impl.tesselator.GLUvertex newVertex2 = new net.java.games.jogl.impl.tesselator.GLUvertex();
-        net.java.games.jogl.impl.tesselator.GLUface newFace = new net.java.games.jogl.impl.tesselator.GLUface();
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
+    public static com.sun.opengl.impl.tesselator.GLUhalfEdge __gl_meshMakeEdge(com.sun.opengl.impl.tesselator.GLUmesh mesh) {
+        com.sun.opengl.impl.tesselator.GLUvertex newVertex1 = new com.sun.opengl.impl.tesselator.GLUvertex();
+        com.sun.opengl.impl.tesselator.GLUvertex newVertex2 = new com.sun.opengl.impl.tesselator.GLUvertex();
+        com.sun.opengl.impl.tesselator.GLUface newFace = new com.sun.opengl.impl.tesselator.GLUface();
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
 
         e = MakeEdge(mesh.eHead);
         if (e == null) return null;
@@ -292,7 +292,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(net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrg, net.java.games.jogl.impl.tesselator.GLUhalfEdge eDst) {
+    public static boolean __gl_meshSplice(com.sun.opengl.impl.tesselator.GLUhalfEdge eOrg, com.sun.opengl.impl.tesselator.GLUhalfEdge eDst) {
         boolean joiningLoops = false;
         boolean joiningVertices = false;
 
@@ -313,7 +313,7 @@ class Mesh {
         Splice(eDst, eOrg);
 
         if (!joiningVertices) {
-            net.java.games.jogl.impl.tesselator.GLUvertex newVertex = new net.java.games.jogl.impl.tesselator.GLUvertex();
+            com.sun.opengl.impl.tesselator.GLUvertex newVertex = new com.sun.opengl.impl.tesselator.GLUvertex();
 
             /* We split one vertex into two -- the new vertex is eDst.Org.
              * Make sure the old vertex points to a valid half-edge.
@@ -322,7 +322,7 @@ class Mesh {
             eOrg.Org.anEdge = eOrg;
         }
         if (!joiningLoops) {
-            net.java.games.jogl.impl.tesselator.GLUface newFace = new net.java.games.jogl.impl.tesselator.GLUface();
+            com.sun.opengl.impl.tesselator.GLUface newFace = new com.sun.opengl.impl.tesselator.GLUface();
 
             /* We split one loop into two -- the new loop is eDst.Lface.
              * Make sure the old face points to a valid half-edge.
@@ -345,8 +345,8 @@ class Mesh {
  * plus a few calls to memFree, but this would allocate and delete
  * unnecessary vertices and faces.
  */
-    static boolean __gl_meshDelete(net.java.games.jogl.impl.tesselator.GLUhalfEdge eDel) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eDelSym = eDel.Sym;
+    static boolean __gl_meshDelete(com.sun.opengl.impl.tesselator.GLUhalfEdge eDel) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eDelSym = eDel.Sym;
         boolean joiningLoops = false;
 
         /* First step: disconnect the origin vertex eDel.Org.  We make all
@@ -367,7 +367,7 @@ class Mesh {
 
             Splice(eDel, eDel.Sym.Lnext);
             if (!joiningLoops) {
-                net.java.games.jogl.impl.tesselator.GLUface newFace = new net.java.games.jogl.impl.tesselator.GLUface();
+                com.sun.opengl.impl.tesselator.GLUface newFace = new com.sun.opengl.impl.tesselator.GLUface();
 
                 /* We are splitting one loop into two -- create a new loop for eDel. */
                 MakeFace(newFace, eDel, eDel.Lface);
@@ -405,9 +405,9 @@ class Mesh {
  * eNew == eOrg.Lnext, and eNew.Dst is a newly created vertex.
  * eOrg and eNew will have the same left face.
  */
-    static net.java.games.jogl.impl.tesselator.GLUhalfEdge __gl_meshAddEdgeVertex(net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrg) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eNewSym;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eNew = MakeEdge(eOrg);
+    static com.sun.opengl.impl.tesselator.GLUhalfEdge __gl_meshAddEdgeVertex(com.sun.opengl.impl.tesselator.GLUhalfEdge eOrg) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eNewSym;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eNew = MakeEdge(eOrg);
 
         eNewSym = eNew.Sym;
 
@@ -417,7 +417,7 @@ class Mesh {
         /* Set the vertex and face information */
         eNew.Org = eOrg.Sym.Org;
         {
-            net.java.games.jogl.impl.tesselator.GLUvertex newVertex = new net.java.games.jogl.impl.tesselator.GLUvertex();
+            com.sun.opengl.impl.tesselator.GLUvertex newVertex = new com.sun.opengl.impl.tesselator.GLUvertex();
 
             MakeVertex(newVertex, eNewSym, eNew.Org);
         }
@@ -431,9 +431,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 net.java.games.jogl.impl.tesselator.GLUhalfEdge __gl_meshSplitEdge(net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrg) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eNew;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
+    public static com.sun.opengl.impl.tesselator.GLUhalfEdge __gl_meshSplitEdge(com.sun.opengl.impl.tesselator.GLUhalfEdge eOrg) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eNew;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
 
         eNew = tempHalfEdge.Sym;
 
@@ -462,10 +462,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 net.java.games.jogl.impl.tesselator.GLUhalfEdge __gl_meshConnect(net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrg, net.java.games.jogl.impl.tesselator.GLUhalfEdge eDst) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eNewSym;
+    static com.sun.opengl.impl.tesselator.GLUhalfEdge __gl_meshConnect(com.sun.opengl.impl.tesselator.GLUhalfEdge eOrg, com.sun.opengl.impl.tesselator.GLUhalfEdge eDst) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eNewSym;
         boolean joiningLoops = false;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eNew = MakeEdge(eOrg);
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eNew = MakeEdge(eOrg);
 
         eNewSym = eNew.Sym;
 
@@ -488,7 +488,7 @@ class Mesh {
         eOrg.Lface.anEdge = eNewSym;
 
         if (!joiningLoops) {
-            net.java.games.jogl.impl.tesselator.GLUface newFace = new net.java.games.jogl.impl.tesselator.GLUface();
+            com.sun.opengl.impl.tesselator.GLUface newFace = new com.sun.opengl.impl.tesselator.GLUface();
 
             /* We split one loop into two -- the new loop is eNew.Lface */
             MakeFace(newFace, eNew, eOrg.Lface);
@@ -506,10 +506,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(net.java.games.jogl.impl.tesselator.GLUface fZap) {
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eStart = fZap.anEdge;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e, eNext, eSym;
-        net.java.games.jogl.impl.tesselator.GLUface fPrev, fNext;
+    static void __gl_meshZapFace(com.sun.opengl.impl.tesselator.GLUface fZap) {
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eStart = fZap.anEdge;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e, eNext, eSym;
+        com.sun.opengl.impl.tesselator.GLUface fPrev, fNext;
 
         /* walk around face, deleting edges whose right face is also null */
         eNext = eStart.Lnext;
@@ -551,12 +551,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 net.java.games.jogl.impl.tesselator.GLUmesh __gl_meshNewMesh() {
-        net.java.games.jogl.impl.tesselator.GLUvertex v;
-        net.java.games.jogl.impl.tesselator.GLUface f;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eSym;
-        net.java.games.jogl.impl.tesselator.GLUmesh mesh = new net.java.games.jogl.impl.tesselator.GLUmesh();
+    public static com.sun.opengl.impl.tesselator.GLUmesh __gl_meshNewMesh() {
+        com.sun.opengl.impl.tesselator.GLUvertex v;
+        com.sun.opengl.impl.tesselator.GLUface f;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eSym;
+        com.sun.opengl.impl.tesselator.GLUmesh mesh = new com.sun.opengl.impl.tesselator.GLUmesh();
 
         v = mesh.vHead;
         f = mesh.fHead;
@@ -599,13 +599,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 net.java.games.jogl.impl.tesselator.GLUmesh __gl_meshUnion(net.java.games.jogl.impl.tesselator.GLUmesh mesh1, net.java.games.jogl.impl.tesselator.GLUmesh mesh2) {
-        net.java.games.jogl.impl.tesselator.GLUface f1 = mesh1.fHead;
-        net.java.games.jogl.impl.tesselator.GLUvertex v1 = mesh1.vHead;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e1 = mesh1.eHead;
-        net.java.games.jogl.impl.tesselator.GLUface f2 = mesh2.fHead;
-        net.java.games.jogl.impl.tesselator.GLUvertex v2 = mesh2.vHead;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e2 = mesh2.eHead;
+    static com.sun.opengl.impl.tesselator.GLUmesh __gl_meshUnion(com.sun.opengl.impl.tesselator.GLUmesh mesh1, com.sun.opengl.impl.tesselator.GLUmesh mesh2) {
+        com.sun.opengl.impl.tesselator.GLUface f1 = mesh1.fHead;
+        com.sun.opengl.impl.tesselator.GLUvertex v1 = mesh1.vHead;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e1 = mesh1.eHead;
+        com.sun.opengl.impl.tesselator.GLUface f2 = mesh2.fHead;
+        com.sun.opengl.impl.tesselator.GLUvertex v2 = mesh2.vHead;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e2 = mesh2.eHead;
 
         /* Add the faces, vertices, and edges of mesh2 to those of mesh1 */
         if (f2.next != f2) {
@@ -635,8 +635,8 @@ class Mesh {
 
 /* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
  */
-    static void __gl_meshDeleteMeshZap(net.java.games.jogl.impl.tesselator.GLUmesh mesh) {
-        net.java.games.jogl.impl.tesselator.GLUface fHead = mesh.fHead;
+    static void __gl_meshDeleteMeshZap(com.sun.opengl.impl.tesselator.GLUmesh mesh) {
+        com.sun.opengl.impl.tesselator.GLUface fHead = mesh.fHead;
 
         while (fHead.next != fHead) {
             __gl_meshZapFace(fHead.next);
@@ -646,10 +646,10 @@ class Mesh {
 
 /* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
  */
-    public static void __gl_meshDeleteMesh(net.java.games.jogl.impl.tesselator.GLUmesh mesh) {
-        net.java.games.jogl.impl.tesselator.GLUface f, fNext;
-        net.java.games.jogl.impl.tesselator.GLUvertex v, vNext;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e, eNext;
+    public static void __gl_meshDeleteMesh(com.sun.opengl.impl.tesselator.GLUmesh mesh) {
+        com.sun.opengl.impl.tesselator.GLUface f, fNext;
+        com.sun.opengl.impl.tesselator.GLUvertex v, vNext;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e, eNext;
 
         for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) {
             fNext = f.next;
@@ -667,13 +667,13 @@ class Mesh {
 
 /* __gl_meshCheckMesh( mesh ) checks a mesh for self-consistency.
  */
-    public static void __gl_meshCheckMesh(net.java.games.jogl.impl.tesselator.GLUmesh mesh) {
-        net.java.games.jogl.impl.tesselator.GLUface fHead = mesh.fHead;
-        net.java.games.jogl.impl.tesselator.GLUvertex vHead = mesh.vHead;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eHead = mesh.eHead;
-        net.java.games.jogl.impl.tesselator.GLUface f, fPrev;
-        net.java.games.jogl.impl.tesselator.GLUvertex v, vPrev;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e, ePrev;
+    public static void __gl_meshCheckMesh(com.sun.opengl.impl.tesselator.GLUmesh mesh) {
+        com.sun.opengl.impl.tesselator.GLUface fHead = mesh.fHead;
+        com.sun.opengl.impl.tesselator.GLUvertex vHead = mesh.vHead;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eHead = mesh.eHead;
+        com.sun.opengl.impl.tesselator.GLUface f, fPrev;
+        com.sun.opengl.impl.tesselator.GLUvertex v, vPrev;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e, ePrev;
 
         fPrev = fHead;
         for (fPrev = fHead; (f = fPrev.next) != fHead; fPrev = f) {
diff --git a/src/net/java/games/jogl/impl/tesselator/Normal.java b/src/classes/com/sun/opengl/impl/tesselator/Normal.java
index 900219662..1c9238193 100644
--- a/src/net/java/games/jogl/impl/tesselator/Normal.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/Normal.java
@@ -40,9 +40,9 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 class Normal {
     private Normal() {
@@ -99,17 +99,17 @@ class Normal {
     }
 
     static void ComputeNormal(GLUtesselatorImpl tess, double[] norm) {
-        net.java.games.jogl.impl.tesselator.GLUvertex v, v1, v2;
+        com.sun.opengl.impl.tesselator.GLUvertex v, v1, v2;
         double c, tLen2, maxLen2;
         double[] maxVal, minVal, d1, d2, tNorm;
-        net.java.games.jogl.impl.tesselator.GLUvertex[] maxVert, minVert;
-        net.java.games.jogl.impl.tesselator.GLUvertex vHead = tess.mesh.vHead;
+        com.sun.opengl.impl.tesselator.GLUvertex[] maxVert, minVert;
+        com.sun.opengl.impl.tesselator.GLUvertex vHead = tess.mesh.vHead;
         int i;
 
         maxVal = new double[3];
         minVal = new double[3];
-        minVert = new net.java.games.jogl.impl.tesselator.GLUvertex[3];
-        maxVert = new net.java.games.jogl.impl.tesselator.GLUvertex[3];
+        minVert = new com.sun.opengl.impl.tesselator.GLUvertex[3];
+        maxVert = new com.sun.opengl.impl.tesselator.GLUvertex[3];
         d1 = new double[3];
         d2 = new double[3];
         tNorm = new double[3];
@@ -183,9 +183,9 @@ class Normal {
 
     static void CheckOrientation(GLUtesselatorImpl tess) {
         double area;
-        net.java.games.jogl.impl.tesselator.GLUface f, fHead = tess.mesh.fHead;
-        net.java.games.jogl.impl.tesselator.GLUvertex v, vHead = tess.mesh.vHead;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
+        com.sun.opengl.impl.tesselator.GLUface f, fHead = tess.mesh.fHead;
+        com.sun.opengl.impl.tesselator.GLUvertex v, vHead = tess.mesh.vHead;
+        com.sun.opengl.impl.tesselator.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.
@@ -214,7 +214,7 @@ class Normal {
  * of the polygon.
  */
     public static void __gl_projectPolygon(GLUtesselatorImpl tess) {
-        net.java.games.jogl.impl.tesselator.GLUvertex v, vHead = tess.mesh.vHead;
+        com.sun.opengl.impl.tesselator.GLUvertex v, vHead = tess.mesh.vHead;
         double w;
         double[] norm = new double[3];
         double[] sUnit, tUnit;
diff --git a/src/net/java/games/jogl/impl/tesselator/PriorityQ.java b/src/classes/com/sun/opengl/impl/tesselator/PriorityQ.java
index 0f92dcecd..e3b8d1aa4 100644
--- a/src/net/java/games/jogl/impl/tesselator/PriorityQ.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/PriorityQ.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 abstract class PriorityQ {
     public static final int INIT_SIZE = 32;
@@ -66,7 +66,7 @@ abstract class PriorityQ {
 /* Violates modularity, but a little faster */
 //    #include "geom.h"
     public static boolean LEQ(Leq leq, Object x, Object y) {
-        return net.java.games.jogl.impl.tesselator.Geom.VertLeq((net.java.games.jogl.impl.tesselator.GLUvertex) x, (net.java.games.jogl.impl.tesselator.GLUvertex) y);
+        return com.sun.opengl.impl.tesselator.Geom.VertLeq((com.sun.opengl.impl.tesselator.GLUvertex) x, (com.sun.opengl.impl.tesselator.GLUvertex) y);
     }
 
     static PriorityQ pqNewPriorityQ(Leq leq) {
diff --git a/src/net/java/games/jogl/impl/tesselator/PriorityQHeap.java b/src/classes/com/sun/opengl/impl/tesselator/PriorityQHeap.java
index b360e37d3..357361c71 100644
--- a/src/net/java/games/jogl/impl/tesselator/PriorityQHeap.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/PriorityQHeap.java
@@ -40,27 +40,27 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 
 
-class PriorityQHeap extends net.java.games.jogl.impl.tesselator.PriorityQ {
-    net.java.games.jogl.impl.tesselator.PriorityQ.PQnode[] nodes;
-    net.java.games.jogl.impl.tesselator.PriorityQ.PQhandleElem[] handles;
+class PriorityQHeap extends com.sun.opengl.impl.tesselator.PriorityQ {
+    com.sun.opengl.impl.tesselator.PriorityQ.PQnode[] nodes;
+    com.sun.opengl.impl.tesselator.PriorityQ.PQhandleElem[] handles;
     int size, max;
     int freeList;
     boolean initialized;
-    net.java.games.jogl.impl.tesselator.PriorityQ.Leq leq;
+    com.sun.opengl.impl.tesselator.PriorityQ.Leq leq;
 
 /* really __gl_pqHeapNewPriorityQ */
-    public PriorityQHeap(net.java.games.jogl.impl.tesselator.PriorityQ.Leq leq) {
+    public PriorityQHeap(com.sun.opengl.impl.tesselator.PriorityQ.Leq leq) {
         size = 0;
-        max = net.java.games.jogl.impl.tesselator.PriorityQ.INIT_SIZE;
-        nodes = new net.java.games.jogl.impl.tesselator.PriorityQ.PQnode[net.java.games.jogl.impl.tesselator.PriorityQ.INIT_SIZE + 1];
+        max = com.sun.opengl.impl.tesselator.PriorityQ.INIT_SIZE;
+        nodes = new com.sun.opengl.impl.tesselator.PriorityQ.PQnode[com.sun.opengl.impl.tesselator.PriorityQ.INIT_SIZE + 1];
         for (int i = 0; i < nodes.length; i++) {
             nodes[i] = new PQnode();
         }
-        handles = new net.java.games.jogl.impl.tesselator.PriorityQ.PQhandleElem[net.java.games.jogl.impl.tesselator.PriorityQ.INIT_SIZE + 1];
+        handles = new com.sun.opengl.impl.tesselator.PriorityQ.PQhandleElem[com.sun.opengl.impl.tesselator.PriorityQ.INIT_SIZE + 1];
         for (int i = 0; i < handles.length; i++) {
             handles[i] = new PQhandleElem();
         }
@@ -79,8 +79,8 @@ class PriorityQHeap extends net.java.games.jogl.impl.tesselator.PriorityQ {
     }
 
     void FloatDown(int curr) {
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
         int hCurr, hChild;
         int child;
 
@@ -108,8 +108,8 @@ class PriorityQHeap extends net.java.games.jogl.impl.tesselator.PriorityQ {
 
 
     void FloatUp(int curr) {
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
         int hCurr, hParent;
         int parent;
 
@@ -150,8 +150,8 @@ class PriorityQHeap extends net.java.games.jogl.impl.tesselator.PriorityQ {
 
         curr = ++size;
         if ((curr * 2) > max) {
-            net.java.games.jogl.impl.tesselator.PriorityQ.PQnode[] saveNodes = nodes;
-            net.java.games.jogl.impl.tesselator.PriorityQ.PQhandleElem[] saveHandles = handles;
+            com.sun.opengl.impl.tesselator.PriorityQ.PQnode[] saveNodes = nodes;
+            com.sun.opengl.impl.tesselator.PriorityQ.PQhandleElem[] saveHandles = handles;
 
             /* If the heap overflows, double its size. */
             max <<= 1;
@@ -200,8 +200,8 @@ class PriorityQHeap extends net.java.games.jogl.impl.tesselator.PriorityQ {
 
 /* really __gl_pqHeapExtractMin */
     Object pqExtractMin() {
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
         int hMin = n[1].handle;
         Object min = h[hMin].key;
 
@@ -222,8 +222,8 @@ class PriorityQHeap extends net.java.games.jogl.impl.tesselator.PriorityQ {
 
 /* really __gl_pqHeapDelete */
     void pqDelete(int hCurr) {
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
-        net.java.games.jogl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQnode[] n = nodes;
+        com.sun.opengl.impl.tesselator.PriorityQ.PQhandleElem[] h = handles;
         int curr;
 
         assert (hCurr >= 1 && hCurr <= max && h[hCurr].key != null);
diff --git a/src/net/java/games/jogl/impl/tesselator/PriorityQSort.java b/src/classes/com/sun/opengl/impl/tesselator/PriorityQSort.java
index d37580ff2..daa4d70c2 100644
--- a/src/net/java/games/jogl/impl/tesselator/PriorityQSort.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/PriorityQSort.java
@@ -35,12 +35,12 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 
 
-class PriorityQSort extends net.java.games.jogl.impl.tesselator.PriorityQ {
-    net.java.games.jogl.impl.tesselator.PriorityQHeap heap;
+class PriorityQSort extends com.sun.opengl.impl.tesselator.PriorityQ {
+    com.sun.opengl.impl.tesselator.PriorityQHeap heap;
     Object[] keys;
 
     // JAVA: 'order' contains indices into the keys array.
@@ -49,15 +49,15 @@ class PriorityQSort extends net.java.games.jogl.impl.tesselator.PriorityQ {
     int[] order;
     int size, max;
     boolean initialized;
-    net.java.games.jogl.impl.tesselator.PriorityQ.Leq leq;
+    com.sun.opengl.impl.tesselator.PriorityQ.Leq leq;
 
-    public PriorityQSort(net.java.games.jogl.impl.tesselator.PriorityQ.Leq leq) {
-        heap = new net.java.games.jogl.impl.tesselator.PriorityQHeap(leq);
+    public PriorityQSort(com.sun.opengl.impl.tesselator.PriorityQ.Leq leq) {
+        heap = new com.sun.opengl.impl.tesselator.PriorityQHeap(leq);
 
-        keys = new Object[net.java.games.jogl.impl.tesselator.PriorityQ.INIT_SIZE];
+        keys = new Object[com.sun.opengl.impl.tesselator.PriorityQ.INIT_SIZE];
 
         size = 0;
-        max = net.java.games.jogl.impl.tesselator.PriorityQ.INIT_SIZE;
+        max = com.sun.opengl.impl.tesselator.PriorityQ.INIT_SIZE;
         initialized = false;
         this.leq = leq;
     }
@@ -69,12 +69,12 @@ class PriorityQSort extends net.java.games.jogl.impl.tesselator.PriorityQ {
         keys = null;
     }
 
-    private static boolean LT(net.java.games.jogl.impl.tesselator.PriorityQ.Leq leq, Object x, Object y) {
-        return (!net.java.games.jogl.impl.tesselator.PriorityQHeap.LEQ(leq, y, x));
+    private static boolean LT(com.sun.opengl.impl.tesselator.PriorityQ.Leq leq, Object x, Object y) {
+        return (!com.sun.opengl.impl.tesselator.PriorityQHeap.LEQ(leq, y, x));
     }
 
-    private static boolean GT(net.java.games.jogl.impl.tesselator.PriorityQ.Leq leq, Object x, Object y) {
-        return (!net.java.games.jogl.impl.tesselator.PriorityQHeap.LEQ(leq, x, y));
+    private static boolean GT(com.sun.opengl.impl.tesselator.PriorityQ.Leq leq, Object x, Object y) {
+        return (!com.sun.opengl.impl.tesselator.PriorityQHeap.LEQ(leq, x, y));
     }
 
     private static void Swap(int[] array, int a, int b) {
@@ -241,7 +241,7 @@ class PriorityQSort extends net.java.games.jogl.impl.tesselator.PriorityQ {
         sortMin = keys[order[size - 1]];
         if (!heap.pqIsEmpty()) {
             heapMin = heap.pqMinimum();
-            if (net.java.games.jogl.impl.tesselator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
+            if (com.sun.opengl.impl.tesselator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
                 return heapMin;
             }
         }
diff --git a/src/net/java/games/jogl/impl/tesselator/Render.java b/src/classes/com/sun/opengl/impl/tesselator/Render.java
index 4763992b8..310a6ce5f 100644
--- a/src/net/java/games/jogl/impl/tesselator/Render.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/Render.java
@@ -40,9 +40,9 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 class Render {
     private static final boolean USE_OPTIMIZED_CODE_PATH = false;
@@ -62,19 +62,19 @@ class Render {
         public FaceCount() {
         }
 
-        public FaceCount(long size, net.java.games.jogl.impl.tesselator.GLUhalfEdge eStart, renderCallBack render) {
+        public FaceCount(long size, com.sun.opengl.impl.tesselator.GLUhalfEdge eStart, renderCallBack render) {
             this.size = size;
             this.eStart = eStart;
             this.render = render;
         }
 
         long size;		/* number of triangles used */
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge eStart;	/* edge where this primitive starts */
+        com.sun.opengl.impl.tesselator.GLUhalfEdge eStart;	/* edge where this primitive starts */
         renderCallBack render;
     };
 
     private static interface renderCallBack {
-        void render(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUhalfEdge e, long size);
+        void render(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.GLUhalfEdge e, long size);
     }
 
     /************************ Strips and Fans decomposition ******************/
@@ -86,8 +86,8 @@ class Render {
  *
  * The rendering output is provided as callbacks (see the api).
  */
-    public static void __gl_renderMesh(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUmesh mesh) {
-        net.java.games.jogl.impl.tesselator.GLUface f;
+    public static void __gl_renderMesh(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.GLUmesh mesh) {
+        com.sun.opengl.impl.tesselator.GLUface f;
 
         /* Make a list of separate triangles so we can render them all at once */
         tess.lonelyTriList = null;
@@ -113,7 +113,7 @@ class Render {
     }
 
 
-    static void RenderMaximumFaceGroup(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUface fOrig) {
+    static void RenderMaximumFaceGroup(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.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
@@ -121,7 +121,7 @@ class Render {
          * is to try all of these, and take the primitive which uses the most
          * triangles (a greedy approach).
          */
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e = fOrig.anEdge;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e = fOrig.anEdge;
         FaceCount max = new FaceCount();
         FaceCount newFace = new FaceCount();
 
@@ -167,17 +167,17 @@ class Render {
  * more complicated, and we need a general tracking method like the
  * one here.
  */
-    private static boolean Marked(net.java.games.jogl.impl.tesselator.GLUface f) {
+    private static boolean Marked(com.sun.opengl.impl.tesselator.GLUface f) {
         return !f.inside || f.marked;
     }
 
-    private static GLUface AddToTrail(net.java.games.jogl.impl.tesselator.GLUface f, net.java.games.jogl.impl.tesselator.GLUface t) {
+    private static GLUface AddToTrail(com.sun.opengl.impl.tesselator.GLUface f, com.sun.opengl.impl.tesselator.GLUface t) {
         f.trail = t;
         f.marked = true;
         return f;
     }
 
-    private static void FreeTrail(net.java.games.jogl.impl.tesselator.GLUface t) {
+    private static void FreeTrail(com.sun.opengl.impl.tesselator.GLUface t) {
         if (true) {
             while (t != null) {
                 t.marked = false;
@@ -188,14 +188,14 @@ class Render {
         }
     }
 
-    static FaceCount MaximumFan(net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrig) {
+    static FaceCount MaximumFan(com.sun.opengl.impl.tesselator.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);
-        net.java.games.jogl.impl.tesselator.GLUface trail = null;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
+        com.sun.opengl.impl.tesselator.GLUface trail = null;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
 
         for (e = eOrig; !Marked(e.Lface); e = e.Onext) {
             trail = AddToTrail(e.Lface, trail);
@@ -216,7 +216,7 @@ class Render {
         return (n & 0x1L) == 0;
     }
 
-    static FaceCount MaximumStrip(net.java.games.jogl.impl.tesselator.GLUhalfEdge eOrig) {
+    static FaceCount MaximumStrip(com.sun.opengl.impl.tesselator.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).
@@ -229,8 +229,8 @@ class Render {
          */
         FaceCount newFace = new FaceCount(0, null, renderStrip);
         long headSize = 0, tailSize = 0;
-        net.java.games.jogl.impl.tesselator.GLUface trail = null;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e, eTail, eHead;
+        com.sun.opengl.impl.tesselator.GLUface trail = null;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e, eTail, eHead;
 
         for (e = eOrig; !Marked(e.Lface); ++tailSize, e = e.Onext) {
             trail = AddToTrail(e.Lface, trail);
@@ -268,7 +268,7 @@ class Render {
     }
 
     private static class RenderTriangle implements renderCallBack {
-        public void render(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUhalfEdge e, long size) {
+        public void render(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.GLUhalfEdge e, long size) {
             /* Just add the triangle to a triangle list, so we can render all
              * the separate triangles at once.
              */
@@ -278,11 +278,11 @@ class Render {
     }
 
 
-    static void RenderLonelyTriangles(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUface f) {
+    static void RenderLonelyTriangles(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.GLUface f) {
         /* Now we render all the separate triangles which could not be
          * grouped into a triangle fan or strip.
          */
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
         int newState;
         int edgeState = -1;	/* force edge state output for first vertex */
 
@@ -312,7 +312,7 @@ class Render {
     }
 
     private static class RenderFan implements renderCallBack {
-        public void render(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUhalfEdge e, long size) {
+        public void render(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.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).
@@ -334,7 +334,7 @@ class Render {
     }
 
     private static class RenderStrip implements renderCallBack {
-        public void render(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUhalfEdge e, long size) {
+        public void render(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.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).
@@ -367,9 +367,9 @@ class Render {
  * contour for each face marked "inside".  The rendering output is
  * provided as callbacks (see the api).
  */
-    public static void __gl_renderBoundary(GLUtesselatorImpl tess, net.java.games.jogl.impl.tesselator.GLUmesh mesh) {
-        net.java.games.jogl.impl.tesselator.GLUface f;
-        net.java.games.jogl.impl.tesselator.GLUhalfEdge e;
+    public static void __gl_renderBoundary(GLUtesselatorImpl tess, com.sun.opengl.impl.tesselator.GLUmesh mesh) {
+        com.sun.opengl.impl.tesselator.GLUface f;
+        com.sun.opengl.impl.tesselator.GLUhalfEdge e;
 
         for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
             if (f.inside) {
@@ -398,7 +398,7 @@ class Render {
  * are degenerate return 0; otherwise (no consistent orientation) return
  * SIGN_INCONSISTENT.
  */ {
-        net.java.games.jogl.impl.tesselator.CachedVertex[] v = tess.cache;
+        com.sun.opengl.impl.tesselator.CachedVertex[] v = tess.cache;
 //            CachedVertex vn = v0 + tess.cacheCount;
         int vn = tess.cacheCount;
 //            CachedVertex vc;
@@ -477,7 +477,7 @@ class Render {
  * output is provided as callbacks (see the api).
  */
     public static boolean __gl_renderCache(GLUtesselatorImpl tess) {
-        net.java.games.jogl.impl.tesselator.CachedVertex[] v = tess.cache;
+        com.sun.opengl.impl.tesselator.CachedVertex[] v = tess.cache;
 //            CachedVertex vn = v0 + tess.cacheCount;
         int vn = tess.cacheCount;
 //            CachedVertex vc;
diff --git a/src/net/java/games/jogl/impl/tesselator/Sweep.java b/src/classes/com/sun/opengl/impl/tesselator/Sweep.java
index 3674d12e1..e399dc37b 100644
--- a/src/net/java/games/jogl/impl/tesselator/Sweep.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/Sweep.java
@@ -40,9 +40,9 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 class Sweep {
     private Sweep() {
diff --git a/src/net/java/games/jogl/impl/tesselator/TessMono.java b/src/classes/com/sun/opengl/impl/tesselator/TessMono.java
index 9e55e1194..2b6e98792 100644
--- a/src/net/java/games/jogl/impl/tesselator/TessMono.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/TessMono.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 class TessMono {
 /* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region
diff --git a/src/net/java/games/jogl/impl/tesselator/TessState.java b/src/classes/com/sun/opengl/impl/tesselator/TessState.java
index 6d89d4678..8816fd9b9 100644
--- a/src/net/java/games/jogl/impl/tesselator/TessState.java
+++ b/src/classes/com/sun/opengl/impl/tesselator/TessState.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl.impl.tesselator;
+package com.sun.opengl.impl.tesselator;
 
 
 class TessState {
diff --git a/src/net/java/games/jogl/impl/windows/WindowsDummyGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsDummyGLDrawable.java
index 95c378c7c..d57ddec2a 100755..100644
--- a/src/net/java/games/jogl/impl/windows/WindowsDummyGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsDummyGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsDummyGLDrawable extends WindowsGLDrawable {
   private long hwnd;
diff --git a/src/net/java/games/jogl/impl/windows/WindowsExternalGLContext.java b/src/classes/com/sun/opengl/impl/windows/WindowsExternalGLContext.java
index 119f9a9da..694aa6b0d 100755
--- a/src/net/java/games/jogl/impl/windows/WindowsExternalGLContext.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsExternalGLContext.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
 import java.nio.*;
 import java.util.*;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsExternalGLContext extends WindowsGLContext {
   private boolean firstMakeCurrent = true;
diff --git a/src/net/java/games/jogl/impl/windows/WindowsExternalGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsExternalGLDrawable.java
index a93489872..f934c1d23 100755
--- a/src/net/java/games/jogl/impl/windows/WindowsExternalGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsExternalGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsExternalGLDrawable extends WindowsGLDrawable {
   public WindowsExternalGLDrawable() {
diff --git a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java b/src/classes/com/sun/opengl/impl/windows/WindowsGLContext.java
index 1a8e3b7a1..61ec8a54b 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsGLContext.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
 import java.nio.*;
 import java.util.*;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsGLContext extends GLContextImpl {
   protected WindowsGLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/windows/WindowsGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java
index 5bbba75c1..9d7366540 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java
@@ -37,14 +37,14 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
 import java.awt.Component;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public abstract class WindowsGLDrawable extends GLDrawableImpl {
   protected static final boolean DEBUG = Debug.debug("WindowsGLDrawable");
diff --git a/src/net/java/games/jogl/impl/windows/WindowsGLDrawableFactory.java b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawableFactory.java
index b43971ca1..ed793afec 100755..100644
--- a/src/net/java/games/jogl/impl/windows/WindowsGLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawableFactory.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
 import java.awt.Component;
 import java.awt.GraphicsConfiguration;
@@ -49,8 +49,8 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.List;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsGLDrawableFactory extends GLDrawableFactoryImpl {
   private static final boolean DEBUG = Debug.debug("WindowsGLDrawableFactory");
diff --git a/src/net/java/games/jogl/impl/windows/WindowsOffscreenGLContext.java b/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLContext.java
index 2eb0edcd5..d9430638c 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsOffscreenGLContext.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsOffscreenGLContext extends WindowsGLContext {
   public WindowsOffscreenGLContext(WindowsOffscreenGLDrawable drawable,
diff --git a/src/net/java/games/jogl/impl/windows/WindowsOffscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLDrawable.java
index 03d76574a..7dd6d2361 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsOffscreenGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsOffscreenGLDrawable extends WindowsGLDrawable {
   private long origbitmap;
diff --git a/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLContext.java b/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLContext.java
index 18c98e3cc..00647e7dd 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLContext.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLContext.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
 import java.util.*;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsOnscreenGLContext extends WindowsGLContext {
   protected WindowsOnscreenGLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLDrawable.java
index 7c385d4b2..f68ec83a5 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLDrawable.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
 import java.awt.Component;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsOnscreenGLDrawable extends WindowsGLDrawable {
   public static final int LOCK_SURFACE_NOT_READY = 1;
diff --git a/src/net/java/games/jogl/impl/windows/WindowsPbufferGLContext.java b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLContext.java
index d6c329d7a..edfc70e5f 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsPbufferGLContext.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsPbufferGLContext extends WindowsGLContext {
   private static final boolean DEBUG = Debug.debug("WindowsPbufferGLContext");
diff --git a/src/net/java/games/jogl/impl/windows/WindowsPbufferGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLDrawable.java
index 3b98491a0..8e660cc51 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsPbufferGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.windows;
+package com.sun.opengl.impl.windows;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class WindowsPbufferGLDrawable extends WindowsGLDrawable {
   private int  initWidth;
diff --git a/src/net/java/games/jogl/impl/x11/X11ExternalGLContext.java b/src/classes/com/sun/opengl/impl/x11/X11ExternalGLContext.java
index f2e825417..4d329ba24 100755
--- a/src/net/java/games/jogl/impl/x11/X11ExternalGLContext.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11ExternalGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11ExternalGLContext extends X11GLContext {
   private boolean firstMakeCurrent = true;
diff --git a/src/net/java/games/jogl/impl/x11/X11ExternalGLDrawable.java b/src/classes/com/sun/opengl/impl/x11/X11ExternalGLDrawable.java
index 93b172f99..371930013 100755
--- a/src/net/java/games/jogl/impl/x11/X11ExternalGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11ExternalGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11ExternalGLDrawable extends X11GLDrawable {
   private int fbConfigID;
diff --git a/src/net/java/games/jogl/impl/x11/X11GLContext.java b/src/classes/com/sun/opengl/impl/x11/X11GLContext.java
index 44233188b..693d3487d 100644
--- a/src/net/java/games/jogl/impl/x11/X11GLContext.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11GLContext.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
 import java.nio.*;
 import java.util.*;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public abstract class X11GLContext extends GLContextImpl {
   protected X11GLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/x11/X11GLDrawable.java b/src/classes/com/sun/opengl/impl/x11/X11GLDrawable.java
index 50394c3b4..1d4f5389b 100644
--- a/src/net/java/games/jogl/impl/x11/X11GLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11GLDrawable.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
 import java.awt.Component;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public abstract class X11GLDrawable extends GLDrawableImpl {
   protected static final boolean DEBUG = Debug.debug("X11GLDrawable");
diff --git a/src/net/java/games/jogl/impl/x11/X11GLDrawableFactory.java b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
index f7c472c6b..997828864 100755..100644
--- a/src/net/java/games/jogl/impl/x11/X11GLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
 import java.awt.Component;
 import java.awt.GraphicsConfiguration;
@@ -45,8 +45,8 @@ import java.awt.GraphicsDevice;
 import java.security.*;
 import java.util.ArrayList;
 import java.util.List;
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11GLDrawableFactory extends GLDrawableFactoryImpl {
   private static final boolean DEBUG = Debug.debug("X11GLDrawableFactory");
diff --git a/src/net/java/games/jogl/impl/x11/X11OffscreenGLContext.java b/src/classes/com/sun/opengl/impl/x11/X11OffscreenGLContext.java
index fcf734825..903b373a4 100644
--- a/src/net/java/games/jogl/impl/x11/X11OffscreenGLContext.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11OffscreenGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11OffscreenGLContext extends X11GLContext {
   private X11OffscreenGLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/x11/X11OffscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/x11/X11OffscreenGLDrawable.java
index 021a4975e..2d7dedd7f 100644
--- a/src/net/java/games/jogl/impl/x11/X11OffscreenGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11OffscreenGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11OffscreenGLDrawable extends X11GLDrawable {
   private long pixmap;
diff --git a/src/net/java/games/jogl/impl/x11/X11OnscreenGLContext.java b/src/classes/com/sun/opengl/impl/x11/X11OnscreenGLContext.java
index 952bb9f4f..d6b79cb8f 100644
--- a/src/net/java/games/jogl/impl/x11/X11OnscreenGLContext.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11OnscreenGLContext.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
 import java.util.*;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11OnscreenGLContext extends X11GLContext {
   protected X11OnscreenGLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/x11/X11OnscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/x11/X11OnscreenGLDrawable.java
index a8308cf13..49000fc14 100644
--- a/src/net/java/games/jogl/impl/x11/X11OnscreenGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11OnscreenGLDrawable.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
 import java.awt.Component;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11OnscreenGLDrawable extends X11GLDrawable {
   public static final int LOCK_SURFACE_NOT_READY = 1;
diff --git a/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java b/src/classes/com/sun/opengl/impl/x11/X11PbufferGLContext.java
index 1e651e3ec..0cb945de7 100644
--- a/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11PbufferGLContext.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11PbufferGLContext extends X11GLContext {
   private X11PbufferGLDrawable drawable;
diff --git a/src/net/java/games/jogl/impl/x11/X11PbufferGLDrawable.java b/src/classes/com/sun/opengl/impl/x11/X11PbufferGLDrawable.java
index e934b8bd1..2a1248405 100644
--- a/src/net/java/games/jogl/impl/x11/X11PbufferGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11PbufferGLDrawable.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
-import net.java.games.jogl.*;
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.impl.*;
 
 public class X11PbufferGLDrawable extends X11GLDrawable {
   private int  initWidth;
diff --git a/src/net/java/games/jogl/impl/x11/X11SunJDKReflection.java b/src/classes/com/sun/opengl/impl/x11/X11SunJDKReflection.java
index 59208e5a9..0760399ab 100755..100644
--- a/src/net/java/games/jogl/impl/x11/X11SunJDKReflection.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11SunJDKReflection.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.impl.x11;
+package com.sun.opengl.impl.x11;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
diff --git a/src/net/java/games/jogl/Animator.java b/src/classes/com/sun/opengl/utils/Animator.java
index c1f311e04..521d1a6a6 100644..100755
--- a/src/net/java/games/jogl/Animator.java
+++ b/src/classes/com/sun/opengl/utils/Animator.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package com.sun.opengl.utils;
 
 import java.awt.Component;
 import java.awt.EventQueue;
@@ -45,7 +45,7 @@ import java.awt.Rectangle;
 import java.util.*;
 import javax.swing.*;
 
-import net.java.games.jogl.impl.*;
+import javax.media.opengl.*;
 
 /** <P> An Animator can be attached to one or more {@link
     GLAutoDrawable}s to drive their display() methods in a loop. </P>
@@ -60,7 +60,6 @@ import net.java.games.jogl.impl.*;
 */
 
 public class Animator {
-  private static final boolean DEBUG = Debug.debug("Animator");
   private volatile ArrayList/*<GLAutoDrawable>*/ drawables = new ArrayList();
   private Runnable runnable;
   private Thread thread;
@@ -247,9 +246,6 @@ public class Animator {
   // the Swing widgets we're animating
   private Runnable drawWithRepaintManagerRunnable = new Runnable() {
       public void run() {
-        if (DEBUG) {
-          System.err.println("Drawing " + lightweights.size() + " with RepaintManager");
-        }
         for (Iterator iter = lightweights.iterator(); iter.hasNext(); ) {
           JComponent comp = (JComponent) iter.next();
           RepaintManager rm = RepaintManager.currentManager(comp);
diff --git a/src/net/java/games/jogl/util/BitmapCharRec.java b/src/classes/com/sun/opengl/utils/BitmapCharRec.java
index 642bbb465..a24ab1122 100644
--- a/src/net/java/games/jogl/util/BitmapCharRec.java
+++ b/src/classes/com/sun/opengl/utils/BitmapCharRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
diff --git a/src/net/java/games/jogl/util/BitmapFontRec.java b/src/classes/com/sun/opengl/utils/BitmapFontRec.java
index 32ea9c183..c300ad159 100644
--- a/src/net/java/games/jogl/util/BitmapFontRec.java
+++ b/src/classes/com/sun/opengl/utils/BitmapFontRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
diff --git a/src/net/java/games/jogl/util/BufferUtils.java b/src/classes/com/sun/opengl/utils/BufferUtils.java
index 7c788100f..c606c446c 100644
--- a/src/net/java/games/jogl/util/BufferUtils.java
+++ b/src/classes/com/sun/opengl/utils/BufferUtils.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 import java.nio.*;
 import java.util.*;
diff --git a/src/net/java/games/jogl/util/CoordRec.java b/src/classes/com/sun/opengl/utils/CoordRec.java
index 661ed23ff..44f786377 100644
--- a/src/net/java/games/jogl/util/CoordRec.java
+++ b/src/classes/com/sun/opengl/utils/CoordRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
diff --git a/src/net/java/games/jogl/FPSAnimator.java b/src/classes/com/sun/opengl/utils/FPSAnimator.java
index 9d596fe86..c45ff15c4 100755
--- a/src/net/java/games/jogl/FPSAnimator.java
+++ b/src/classes/com/sun/opengl/utils/FPSAnimator.java
@@ -37,9 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package com.sun.opengl.utils;
 
 import java.util.*;
+import javax.media.opengl.*;
 
 /** An Animator subclass which attempts to achieve a target
     frames-per-second rate to avoid using all CPU time. The target FPS
diff --git a/src/net/java/games/jogl/util/GLUT.java b/src/classes/com/sun/opengl/utils/GLUT.java
index aad01e13f..0fd1e6b0a 100644
--- a/src/net/java/games/jogl/util/GLUT.java
+++ b/src/classes/com/sun/opengl/utils/GLUT.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
 
 /** Subset of the routines provided by the GLUT interface. Note the
     signatures of many of the methods are necessarily different than
diff --git a/src/net/java/games/jogl/util/GLUTBitmap8x13.java b/src/classes/com/sun/opengl/utils/GLUTBitmap8x13.java
index caa007726..a373aeb8d 100644
--- a/src/net/java/games/jogl/util/GLUTBitmap8x13.java
+++ b/src/classes/com/sun/opengl/utils/GLUTBitmap8x13.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTBitmap8x13 {
 
diff --git a/src/net/java/games/jogl/util/GLUTBitmap9x15.java b/src/classes/com/sun/opengl/utils/GLUTBitmap9x15.java
index 05aa2635b..c1668967d 100644
--- a/src/net/java/games/jogl/util/GLUTBitmap9x15.java
+++ b/src/classes/com/sun/opengl/utils/GLUTBitmap9x15.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTBitmap9x15 {
 
diff --git a/src/net/java/games/jogl/util/GLUTBitmapHelvetica10.java b/src/classes/com/sun/opengl/utils/GLUTBitmapHelvetica10.java
index d238d7d16..9a329f6a3 100644
--- a/src/net/java/games/jogl/util/GLUTBitmapHelvetica10.java
+++ b/src/classes/com/sun/opengl/utils/GLUTBitmapHelvetica10.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTBitmapHelvetica10 {
 
diff --git a/src/net/java/games/jogl/util/GLUTBitmapHelvetica12.java b/src/classes/com/sun/opengl/utils/GLUTBitmapHelvetica12.java
index fe29ab84f..e27431c4e 100644
--- a/src/net/java/games/jogl/util/GLUTBitmapHelvetica12.java
+++ b/src/classes/com/sun/opengl/utils/GLUTBitmapHelvetica12.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTBitmapHelvetica12 {
 
diff --git a/src/net/java/games/jogl/util/GLUTBitmapHelvetica18.java b/src/classes/com/sun/opengl/utils/GLUTBitmapHelvetica18.java
index 31fbda94c..baf95d818 100644
--- a/src/net/java/games/jogl/util/GLUTBitmapHelvetica18.java
+++ b/src/classes/com/sun/opengl/utils/GLUTBitmapHelvetica18.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTBitmapHelvetica18 {
 
diff --git a/src/net/java/games/jogl/util/GLUTBitmapTimesRoman10.java b/src/classes/com/sun/opengl/utils/GLUTBitmapTimesRoman10.java
index 175b857e0..00cf2975c 100644
--- a/src/net/java/games/jogl/util/GLUTBitmapTimesRoman10.java
+++ b/src/classes/com/sun/opengl/utils/GLUTBitmapTimesRoman10.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTBitmapTimesRoman10 {
 
diff --git a/src/net/java/games/jogl/util/GLUTBitmapTimesRoman24.java b/src/classes/com/sun/opengl/utils/GLUTBitmapTimesRoman24.java
index 25684ceff..22d2a19a2 100644
--- a/src/net/java/games/jogl/util/GLUTBitmapTimesRoman24.java
+++ b/src/classes/com/sun/opengl/utils/GLUTBitmapTimesRoman24.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTBitmapTimesRoman24 {
 
diff --git a/src/net/java/games/jogl/util/GLUTStrokeMonoRoman.java b/src/classes/com/sun/opengl/utils/GLUTStrokeMonoRoman.java
index f5d2ebcff..39aaf8a18 100644
--- a/src/net/java/games/jogl/util/GLUTStrokeMonoRoman.java
+++ b/src/classes/com/sun/opengl/utils/GLUTStrokeMonoRoman.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTStrokeMonoRoman {
 
diff --git a/src/net/java/games/jogl/util/GLUTStrokeRoman.java b/src/classes/com/sun/opengl/utils/GLUTStrokeRoman.java
index 2755b8dfc..de040508a 100644
--- a/src/net/java/games/jogl/util/GLUTStrokeRoman.java
+++ b/src/classes/com/sun/opengl/utils/GLUTStrokeRoman.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 class GLUTStrokeRoman {
 
diff --git a/src/net/java/games/jogl/util/StrokeCharRec.java b/src/classes/com/sun/opengl/utils/StrokeCharRec.java
index 7c961fb4d..8601e4079 100644
--- a/src/net/java/games/jogl/util/StrokeCharRec.java
+++ b/src/classes/com/sun/opengl/utils/StrokeCharRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
diff --git a/src/net/java/games/jogl/util/StrokeFontRec.java b/src/classes/com/sun/opengl/utils/StrokeFontRec.java
index 133380a77..2ea2d21ac 100644
--- a/src/net/java/games/jogl/util/StrokeFontRec.java
+++ b/src/classes/com/sun/opengl/utils/StrokeFontRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
diff --git a/src/net/java/games/jogl/util/StrokeRec.java b/src/classes/com/sun/opengl/utils/StrokeRec.java
index cc4571465..bc875856e 100644
--- a/src/net/java/games/jogl/util/StrokeRec.java
+++ b/src/classes/com/sun/opengl/utils/StrokeRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl.util;
+package com.sun.opengl.utils;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
diff --git a/src/net/java/games/jogl/Version.java b/src/classes/com/sun/opengl/utils/Version.java
index 7d28f7fc8..5d952f042 100644
--- a/src/net/java/games/jogl/Version.java
+++ b/src/classes/com/sun/opengl/utils/Version.java
@@ -31,7 +31,7 @@
 * design, construction, operation or maintenance of any nuclear facility.
 */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /**
  * The version and build number of this implementation.
diff --git a/src/net/java/games/jogl/ComponentEvents.java b/src/classes/javax/media/opengl/ComponentEvents.java
index e21441aeb..bfbbb957b 100644
--- a/src/net/java/games/jogl/ComponentEvents.java
+++ b/src/classes/javax/media/opengl/ComponentEvents.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 import java.awt.event.*;
 import java.beans.PropertyChangeListener;
diff --git a/src/net/java/games/jogl/DefaultGLCapabilitiesChooser.java b/src/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
index 119007617..391787a01 100644
--- a/src/net/java/games/jogl/DefaultGLCapabilitiesChooser.java
+++ b/src/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
-import net.java.games.jogl.impl.Debug;
+import com.sun.opengl.impl.Debug;
 
 /** <P> The default implementation of the {@link
     GLCapabilitiesChooser} interface, which provides consistent visual
diff --git a/src/net/java/games/jogl/GLAutoDrawable.java b/src/classes/javax/media/opengl/GLAutoDrawable.java
index ce3755bd8..e7b771310 100755..100644
--- a/src/net/java/games/jogl/GLAutoDrawable.java
+++ b/src/classes/javax/media/opengl/GLAutoDrawable.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /** A higher-level abstraction than {@link GLDrawable} which supplies
     an event based mechanism ({@link GLEventListener}) for performing
diff --git a/src/net/java/games/jogl/GLCanvas.java b/src/classes/javax/media/opengl/GLCanvas.java
index 3a3a995eb..90fa50d99 100644
--- a/src/net/java/games/jogl/GLCanvas.java
+++ b/src/classes/javax/media/opengl/GLCanvas.java
@@ -37,14 +37,14 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 import java.awt.Canvas;
 import java.awt.EventQueue;
 import java.awt.Graphics;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
-import net.java.games.jogl.impl.*;
+import com.sun.opengl.impl.*;
 
 // FIXME: Subclasses need to call resetGLFunctionAvailability() on their
 // context whenever the displayChanged() function is called on our
diff --git a/src/net/java/games/jogl/GLCapabilities.java b/src/classes/javax/media/opengl/GLCapabilities.java
index d645a71a6..77ada1b1a 100644
--- a/src/net/java/games/jogl/GLCapabilities.java
+++ b/src/classes/javax/media/opengl/GLCapabilities.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /** Specifies a set of OpenGL capabilities that a rendering context
     must support, such as color depth and whether stereo is enabled.
diff --git a/src/net/java/games/jogl/GLCapabilitiesChooser.java b/src/classes/javax/media/opengl/GLCapabilitiesChooser.java
index 951dd52a1..9d970ff42 100644
--- a/src/net/java/games/jogl/GLCapabilitiesChooser.java
+++ b/src/classes/javax/media/opengl/GLCapabilitiesChooser.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /** Provides a mechanism by which applications can customize the
     window type selection for a given {@link GLCapabilities}.
diff --git a/src/net/java/games/jogl/GLContext.java b/src/classes/javax/media/opengl/GLContext.java
index 7d9aa94aa..8a519fde6 100755..100644
--- a/src/net/java/games/jogl/GLContext.java
+++ b/src/classes/javax/media/opengl/GLContext.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /** Abstraction for an OpenGL rendering context. In order to perform
     OpenGL rendering, a context must be "made current" on the current
diff --git a/src/net/java/games/jogl/GLDrawable.java b/src/classes/javax/media/opengl/GLDrawable.java
index 6d8457d92..5639a0bcd 100644
--- a/src/net/java/games/jogl/GLDrawable.java
+++ b/src/classes/javax/media/opengl/GLDrawable.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 // FIXME: We need some way to tell when the device upon which the canvas is
 // being displayed has changed (e.g., the user drags the canvas's parent
diff --git a/src/net/java/games/jogl/GLDrawableFactory.java b/src/classes/javax/media/opengl/GLDrawableFactory.java
index 4b1d28124..076856b6b 100644
--- a/src/net/java/games/jogl/GLDrawableFactory.java
+++ b/src/classes/javax/media/opengl/GLDrawableFactory.java
@@ -37,17 +37,17 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
-import net.java.games.jogl.impl.*;
+import com.sun.opengl.impl.*;
 
 /** <P> Provides a virtual machine- and operating system-independent
     mechanism for creating {@link GLDrawable}s. </P>
 
-    <P> The {@link net.java.games.jogl.GLCapabilities} objects passed in to the
+    <P> The {@link javax.media.opengl.GLCapabilities} objects passed in to the
     various factory methods are used as a hint for the properties of
     the returned drawable. The default capabilities selection
     algorithm (equivalent to passing in a null {@link
@@ -88,12 +88,12 @@ public abstract class GLDrawableFactory {
         // static dependencies with platform-specific code here using reflection.
 
         if (osNameLowerCase.startsWith("wind")) {
-          factoryClass = Class.forName("net.java.games.jogl.impl.windows.WindowsGLDrawableFactory");
+          factoryClass = Class.forName("com.sun.opengl.impl.windows.WindowsGLDrawableFactory");
         } else if (osNameLowerCase.startsWith("mac os x")) {
-          factoryClass = Class.forName("net.java.games.jogl.impl.macosx.MacOSXGLDrawableFactory");
+          factoryClass = Class.forName("com.sun.opengl.impl.macosx.MacOSXGLDrawableFactory");
         } else {
           // Assume Linux, Solaris, etc. Should probably test for these explicitly.
-          factoryClass = Class.forName("net.java.games.jogl.impl.x11.X11GLDrawableFactory");
+          factoryClass = Class.forName("com.sun.opengl.impl.x11.X11GLDrawableFactory");
         }
 
         if (factoryClass == null) {
diff --git a/src/net/java/games/jogl/GLEventListener.java b/src/classes/javax/media/opengl/GLEventListener.java
index 05053bf01..3aadbf833 100644
--- a/src/net/java/games/jogl/GLEventListener.java
+++ b/src/classes/javax/media/opengl/GLEventListener.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 import java.util.EventListener;
 
@@ -67,7 +67,7 @@ public interface GLEventListener extends EventListener {
   /** Called by the drawable during the first repaint after the
       component has been resized. The client can update the viewport
       and view volume of the window appropriately, for example by a
-      call to {@link net.java.games.jogl.GL#glViewport}; note that for
+      call to {@link javax.media.opengl.GL#glViewport}; note that for
       convenience the component has already called <code>glViewport(x,
       y, width, height)</code> when this method is called, so the
       client may not have to do anything in this method.
diff --git a/src/net/java/games/jogl/GLException.java b/src/classes/javax/media/opengl/GLException.java
index e814ecbc8..644042e15 100644
--- a/src/net/java/games/jogl/GLException.java
+++ b/src/classes/javax/media/opengl/GLException.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /** A generic exception for OpenGL errors used throughout the binding
     as a substitute for {@link RuntimeException}. */
diff --git a/src/net/java/games/jogl/GLJPanel.java b/src/classes/javax/media/opengl/GLJPanel.java
index c5b3b7d95..850148509 100644
--- a/src/net/java/games/jogl/GLJPanel.java
+++ b/src/classes/javax/media/opengl/GLJPanel.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 import java.awt.Component;
 import java.awt.EventQueue;
@@ -52,7 +52,7 @@ import java.nio.*;
 import java.security.*;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import net.java.games.jogl.impl.*;
+import com.sun.opengl.impl.*;
 
 // FIXME: Subclasses need to call resetGLFunctionAvailability() on their
 // context whenever the displayChanged() function is called on their
diff --git a/src/net/java/games/jogl/GLPbuffer.java b/src/classes/javax/media/opengl/GLPbuffer.java
index 074d8b3c4..607c5c9fa 100644
--- a/src/net/java/games/jogl/GLPbuffer.java
+++ b/src/classes/javax/media/opengl/GLPbuffer.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /** Provides offscreen rendering support via pbuffers. The principal
     addition of this interface is a {@link #destroy} method to
diff --git a/src/net/java/games/jogl/GLUquadric.java b/src/classes/javax/media/opengl/GLUquadric.java
index 3aeccc166..ce372366d 100755..100644
--- a/src/net/java/games/jogl/GLUquadric.java
+++ b/src/classes/javax/media/opengl/GLUquadric.java
@@ -1,4 +1,4 @@
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /**
  * Wrapper for a GLU quadric object.
diff --git a/src/net/java/games/jogl/GLUtesselator.java b/src/classes/javax/media/opengl/GLUtesselator.java
index ea80ccb02..a98aa39c5 100644
--- a/src/net/java/games/jogl/GLUtesselator.java
+++ b/src/classes/javax/media/opengl/GLUtesselator.java
@@ -40,14 +40,14 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /**
  * The <b>GLUtesselator</b> object is used to hold the data, such as the
  * vertices, edges and callback objects, to describe and tessellate complex
  * polygons.  A <b>GLUtesselator</b> object is used with the
- * {@link net.java.games.jogl.GLU GLU} tesselator methods and
- * {@link net.java.games.jogl.GLUtesselatorCallback GLU callbacks}.
+ * {@link javax.media.opengl.GLU GLU} tesselator methods and
+ * {@link javax.media.opengl.GLUtesselatorCallback GLU callbacks}.
  *
  * @author Eric Veach, July 1994
  * @author Java Port: Pepijn Van Eechhoudt, July 2003
diff --git a/src/net/java/games/jogl/GLUtesselatorCallback.java b/src/classes/javax/media/opengl/GLUtesselatorCallback.java
index 0da9a15fd..de2094b1b 100644
--- a/src/net/java/games/jogl/GLUtesselatorCallback.java
+++ b/src/classes/javax/media/opengl/GLUtesselatorCallback.java
@@ -40,7 +40,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl;
+package javax.media.opengl;
 
 /**
  * <b>GLUtesselatorCallback</b> interface provides methods that the user will
@@ -53,7 +53,7 @@ package net.java.games.jogl;
 public interface GLUtesselatorCallback {
   /**
    * The <b>begin</b> callback method is invoked like
-   * {@link net.java.games.jogl.GL#glBegin glBegin} to indicate the start of a
+   * {@link javax.media.opengl.GL#glBegin glBegin} to indicate the start of a
    * (triangle) primitive. The method takes a single argument of type int. If
    * the <b>GLU_TESS_BOUNDARY_ONLY</b> property is set to <b>GL_FALSE</b>, then
    * the argument is set to either <b>GL_TRIANGLE_FAN</b>,
@@ -66,17 +66,17 @@ public interface GLUtesselatorCallback {
    *        values are valid:  <b>GL_TRIANGLE_FAN</b>, <b>GL_TRIANGLE_STRIP</b>,
    *        <b>GL_TRIANGLES</b> or <b>GL_LINE_LOOP</b>.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback           gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#end     end
-   * @see net.java.games.jogl.GLUtesselatorCallback#begin   begin
+   * @see javax.media.opengl.GLU#gluTessCallback           gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#end     end
+   * @see javax.media.opengl.GLUtesselatorCallback#begin   begin
    */
   public void begin(int type);
 
   /**
-   * The same as the {@link net.java.games.jogl.GLUtesselatorCallback#begin
+   * The same as the {@link javax.media.opengl.GLUtesselatorCallback#begin
    * begin} callback method except that it takes an additional reference
    * argument. This reference is identical to the opaque reference provided when
-   * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
+   * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
    * called.
    *
    * @param type
@@ -86,16 +86,16 @@ public interface GLUtesselatorCallback {
    * @param polygonData
    *        Specifics a reference to user-defined data.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback           gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#endData endData
-   * @see net.java.games.jogl.GLUtesselatorCallback#begin   begin
+   * @see javax.media.opengl.GLU#gluTessCallback           gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#endData endData
+   * @see javax.media.opengl.GLUtesselatorCallback#begin   begin
    */
   public void beginData(int type, Object polygonData);
 
 
   /**
    * The <b>edgeFlag</b> callback method is similar to
-   * {@link net.java.games.jogl.GL#glEdgeFlag glEdgeFlag}. The method takes
+   * {@link javax.media.opengl.GL#glEdgeFlag glEdgeFlag}. The method takes
    * a single boolean boundaryEdge that indicates which edges lie on the
    * polygon boundary. If the boundaryEdge is <b>GL_TRUE</b>, then each vertex
    * that follows begins an edge that lies on the polygon boundary, that is,
@@ -114,17 +114,17 @@ public interface GLUtesselatorCallback {
    * @param boundaryEdge
    *        Specifics which edges lie on the polygon boundary.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#edgeFlagData edgeFlagData
+   * @see javax.media.opengl.GLU#gluTessCallback gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#edgeFlagData edgeFlagData
    */
   public void edgeFlag(boolean boundaryEdge);
 
 
   /**
-   * The same as the {@link net.java.games.jogl.GLUtesselatorCallback#edgeFlag
+   * The same as the {@link javax.media.opengl.GLUtesselatorCallback#edgeFlag
    * edgeFlage} callback method except that it takes an additional reference
    * argument. This reference is identical to the opaque reference provided when
-   * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
+   * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
    * called.
    *
    * @param boundaryEdge
@@ -132,38 +132,38 @@ public interface GLUtesselatorCallback {
    * @param polygonData
    *        Specifics a reference to user-defined data.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback            gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#edgeFlag edgeFlag
+   * @see javax.media.opengl.GLU#gluTessCallback            gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#edgeFlag edgeFlag
    */
   public void edgeFlagData(boolean boundaryEdge, Object polygonData);
 
 
   /**
    * The <b>vertex</b> callback method is invoked between the
-   * {@link net.java.games.jogl.GLUtesselatorCallback#begin begin} and
-   * {@link net.java.games.jogl.GLUtesselatorCallback#end end} callback methods.
-   * It is similar to {@link net.java.games.jogl.GL#glVertex3f glVertex3f}, and it
+   * {@link javax.media.opengl.GLUtesselatorCallback#begin begin} and
+   * {@link javax.media.opengl.GLUtesselatorCallback#end end} callback methods.
+   * It is similar to {@link javax.media.opengl.GL#glVertex3f glVertex3f}, and it
    * defines the vertices of the triangles created by the tessellation process.
    * The method takes a reference as its only argument. This reference is
    * identical to the opaque reference provided by the user when the vertex was
-   * described (see {@link net.java.games.jogl.GLU#gluTessVertex
+   * described (see {@link javax.media.opengl.GLU#gluTessVertex
    * gluTessVertex}).
    *
    * @param vertexData
    *        Specifics a reference to the vertices of the triangles created
    *        byt the tessellatin process.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback              gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#vertexData vertexData
+   * @see javax.media.opengl.GLU#gluTessCallback              gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#vertexData vertexData
    */
   public void vertex(Object vertexData);
 
 
   /**
-   * The same as the {@link net.java.games.jogl.GLUtesselatorCallback#vertex
+   * The same as the {@link javax.media.opengl.GLUtesselatorCallback#vertex
    * vertex} callback method except that it takes an additional reference
    * argument. This reference is identical to the opaque reference provided when
-   * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
+   * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
    * called.
    *
    * @param vertexData
@@ -172,37 +172,37 @@ public interface GLUtesselatorCallback {
    * @param polygonData
    *        Specifics a reference to user-defined data.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback          gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#vertex vertex
+   * @see javax.media.opengl.GLU#gluTessCallback          gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#vertex vertex
    */
   public void vertexData(Object vertexData, Object polygonData);
 
 
   /**
    * The end callback serves the same purpose as
-   * {@link net.java.games.jogl.GL#glEnd glEnd}. It indicates the end of a
+   * {@link javax.media.opengl.GL#glEnd glEnd}. It indicates the end of a
    * primitive and it takes no arguments.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback           gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#begin   begin
-   * @see net.java.games.jogl.GLUtesselatorCallback#endData endData
+   * @see javax.media.opengl.GLU#gluTessCallback           gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#begin   begin
+   * @see javax.media.opengl.GLUtesselatorCallback#endData endData
    */
   public void end();
 
 
   /**
-   * The same as the {@link net.java.games.jogl.GLUtesselatorCallback#end end}
+   * The same as the {@link javax.media.opengl.GLUtesselatorCallback#end end}
    * callback method except that it takes an additional reference argument. This
    * reference is identical to the opaque reference provided when
-   * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
+   * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
    * called.
    *
    * @param polygonData
    *        Specifics a reference to user-defined data.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback             gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#beginData beginData
-   * @see net.java.games.jogl.GLUtesselatorCallback#end       end
+   * @see javax.media.opengl.GLU#gluTessCallback             gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#beginData beginData
+   * @see javax.media.opengl.GLUtesselatorCallback#end       end
    */
   public void endData(Object polygonData);
 
@@ -224,7 +224,7 @@ public interface GLUtesselatorCallback {
    * <i>data</i> and <i>weight</i>, and return the new vertex pointer in
    * <i>outData</i>. This handle is supplied during rendering callbacks. The
    * user is responsible for freeing the memory some time after
-   * {@link net.java.games.jogl.GLU#gluTessEndPolygon gluTessEndPolygon} is
+   * {@link javax.media.opengl.GLU#gluTessEndPolygon gluTessEndPolygon} is
    * called.<P>
    *
    * For example, if the polygon lies in an arbitrary plane in 3-space, and a
@@ -268,18 +268,18 @@ public interface GLUtesselatorCallback {
    * @param outData
    *        Reference user the put the coodinates of the new vertex.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback               gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#combineData combineData
+   * @see javax.media.opengl.GLU#gluTessCallback               gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#combineData combineData
    */
   public void combine(double[] coords, Object[] data,
                       float[] weight, Object[] outData);
 
 
   /**
-   * The same as the {@link net.java.games.jogl.GLUtesselatorCallback#combine
+   * The same as the {@link javax.media.opengl.GLUtesselatorCallback#combine
    * combine} callback method except that it takes an additional reference
    * argument. This reference is identical to the opaque reference provided when
-   * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
+   * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
    * called.
    *
    * @param coords
@@ -293,8 +293,8 @@ public interface GLUtesselatorCallback {
    * @param polygonData
    *        Specifics a reference to user-defined data.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback           gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#combine combine
+   * @see javax.media.opengl.GLU#gluTessCallback           gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#combine combine
    */
   public void combineData(double[] coords, Object[] data,
                           float[] weight, Object[] outData,
@@ -309,7 +309,7 @@ public interface GLUtesselatorCallback {
    * <b>GLU_TESS_MISSING_END_CONTOUR</b>, <b>GLU_TESS_COORD_TOO_LARGE</b>,
    * <b>GLU_TESS_NEED_COMBINE_CALLBACK</b> or <b>GLU_OUT_OF_MEMORY</b>.
    * Character strings describing these errors can be retrieved with the
-   * {@link net.java.games.jogl.GLU#gluErrorString gluErrorString} call.<P>
+   * {@link javax.media.opengl.GLU#gluErrorString gluErrorString} call.<P>
    *
    * The GLU library will recover from the first four errors by inserting the
    * missing call(s). <b>GLU_TESS_COORD_TOO_LARGE</b> indicates that some
@@ -326,17 +326,17 @@ public interface GLUtesselatorCallback {
    * @param errnum
    *        Specifics the error number code.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback             gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#errorData errorData
+   * @see javax.media.opengl.GLU#gluTessCallback             gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#errorData errorData
    */
   public void error(int errnum);
 
 
   /**
-   * The same as the {@link net.java.games.jogl.GLUtesselatorCallback#error
+   * The same as the {@link javax.media.opengl.GLUtesselatorCallback#error
    * error} callback method except that it takes an additional reference
    * argument. This reference is identical to the opaque reference provided when
-   * {@link net.java.games.jogl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
+   * {@link javax.media.opengl.GLU#gluTessBeginPolygon gluTessBeginPolygon} was
    * called.
    *
    * @param errnum
@@ -344,10 +344,10 @@ public interface GLUtesselatorCallback {
    * @param polygonData
    *        Specifics a reference to user-defined data.
    *
-   * @see net.java.games.jogl.GLU#gluTessCallback         gluTessCallback
-   * @see net.java.games.jogl.GLUtesselatorCallback#error error
+   * @see javax.media.opengl.GLU#gluTessCallback         gluTessCallback
+   * @see javax.media.opengl.GLUtesselatorCallback#error error
    */
   public void errorData(int errnum, Object polygonData);
 
-  //void mesh(net.java.games.jogl.impl.tesselator.GLUmesh mesh);
+  //void mesh(com.sun.opengl.impl.tesselator.GLUmesh mesh);
 }
diff --git a/src/net/java/games/jogl/GLUtesselatorCallbackAdapter.java b/src/classes/javax/media/opengl/GLUtesselatorCallbackAdapter.java
index 162eaec93..0da90e0bd 100644
--- a/src/net/java/games/jogl/GLUtesselatorCallbackAdapter.java
+++ b/src/classes/javax/media/opengl/GLUtesselatorCallbackAdapter.java
@@ -40,13 +40,13 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package net.java.games.jogl;
+package javax.media.opengl;
 
-import net.java.games.jogl.GLUtesselatorCallback;
+import javax.media.opengl.GLUtesselatorCallback;
 
 /**
  * The <b>GLUtesselatorCallbackAdapter</b> provides a default implementation of
- * {@link net.java.games.jogl.GLUtesselatorCallback GLUtesselatorCallback}
+ * {@link javax.media.opengl.GLUtesselatorCallback GLUtesselatorCallback}
  * with empty callback methods.  This class can be extended to provide user
  * defined callback methods.
  *
@@ -60,7 +60,7 @@ public class GLUtesselatorCallbackAdapter implements GLUtesselatorCallback {
     public void edgeFlag(boolean boundaryEdge) {}
     public void vertex(Object vertexData) {}
     public void end() {}
-//  public void mesh(net.java.games.jogl.impl.tesselator.GLUmesh mesh) {}
+//  public void mesh(com.sun.opengl.impl.tesselator.GLUmesh mesh) {}
     public void error(int errnum) {}
     public void combine(double[] coords, Object[] data,
                             float[] weight, Object[] outData) {}
diff --git a/src/native/jogl/BufferUtils.c b/src/native/jogl/BufferUtils.c
index 7698b00ba..a7875dce2 100644
--- a/src/native/jogl/BufferUtils.c
+++ b/src/native/jogl/BufferUtils.c
@@ -49,6 +49,6 @@
 #endif
 
 JNIEXPORT jobject JNICALL
-Java_net_java_games_jogl_util_BufferUtils_bufferOffset0(JNIEnv* env, jclass unused, jint offset) {
+Java_com_sun_opengl_util_BufferUtils_bufferOffset0(JNIEnv* env, jclass unused, jint offset) {
   return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) offset, 0);
 }
diff --git a/src/native/jogl/InternalBufferUtils.c b/src/native/jogl/InternalBufferUtils.c
index 73c52011f..083f51b42 100644
--- a/src/native/jogl/InternalBufferUtils.c
+++ b/src/native/jogl/InternalBufferUtils.c
@@ -49,6 +49,6 @@
 #endif
 
 JNIEXPORT jobject JNICALL
-Java_net_java_games_jogl_impl_InternalBufferUtils_newDirectByteBuffer(JNIEnv* env, jclass unused, jlong address, jint capacity) {
+Java_com_sun_opengl_impl_InternalBufferUtils_newDirectByteBuffer(JNIEnv* env, jclass unused, jlong address, jint capacity) {
   return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) address, capacity);
 }
diff --git a/src/native/jogl/JAWT_DrawingSurfaceInfo.c b/src/native/jogl/JAWT_DrawingSurfaceInfo.c
index 59c575f0c..2b64ec858 100644
--- a/src/native/jogl/JAWT_DrawingSurfaceInfo.c
+++ b/src/native/jogl/JAWT_DrawingSurfaceInfo.c
@@ -41,13 +41,13 @@
 
 #ifdef WIN32
   #define PLATFORM_DSI_SIZE sizeof(JAWT_Win32DrawingSurfaceInfo)
-  static const char* platformDSIClassName = "net/java/games/jogl/impl/windows/JAWT_Win32DrawingSurfaceInfo";
+  static const char* platformDSIClassName = "com/sun/opengl/impl/windows/JAWT_Win32DrawingSurfaceInfo";
 #elif defined(linux) || defined(__sun) || defined(__FreeBSD__)
   #define PLATFORM_DSI_SIZE sizeof(JAWT_X11DrawingSurfaceInfo)
-  static const char* platformDSIClassName = "net/java/games/jogl/impl/x11/JAWT_X11DrawingSurfaceInfo";
+  static const char* platformDSIClassName = "com/sun/opengl/impl/x11/JAWT_X11DrawingSurfaceInfo";
 #elif defined(macosx)
   #define PLATFORM_DSI_SIZE sizeof(JAWT_MacOSXDrawingSurfaceInfo)
-  static const char* platformDSIClassName = "net/java/games/jogl/impl/macosx/JAWT_MacOSXDrawingSurfaceInfo";
+  static const char* platformDSIClassName = "com/sun/opengl/impl/macosx/JAWT_MacOSXDrawingSurfaceInfo";
 #else
   ERROR: port JAWT_DrawingSurfaceInfo.c to your platform
 #endif
@@ -56,7 +56,7 @@ static jclass    platformDSIClass = NULL;
 static jmethodID constructor   = NULL;
 
 JNIEXPORT jobject JNICALL
-Java_net_java_games_jogl_impl_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
+Java_com_sun_opengl_impl_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
   JAWT_DrawingSurfaceInfo* dsi;
   jobject dirbuf;
   jclass clazz;