Relocate package prefix to org.jogamp.java3d

397 files changed, 2346 insertions, 2346 deletions

diff --git a/src/classes/share/META-INF/services/javax.media.j3d.GeometryService b/src/classes/share/META-INF/services/javax.media.j3d.GeometryService
deleted file mode 100644
index fc954bc..0000000
--- a/src/classes/share/META-INF/services/javax.media.j3d.GeometryService
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.j3d.utils.geometry.GeometryServiceImpl
diff --git a/src/classes/share/META-INF/services/org.jogamp.java3d.GeometryService b/src/classes/share/META-INF/services/org.jogamp.java3d.GeometryService
new file mode 100644
index 0000000..3052420
--- /dev/null
+++ b/src/classes/share/META-INF/services/org.jogamp.java3d.GeometryService
@@ -0,0 +1 @@
+org.jogamp.java3d.utils.geometry.GeometryServiceImpl
diff --git a/src/classes/share/com/sun/j3d/ExceptionStrings.properties b/src/classes/share/org/jogamp/java3d/ExceptionStrings.properties
index 363945c..363945c 100644
--- a/src/classes/share/com/sun/j3d/ExceptionStrings.properties
+++ b/src/classes/share/org/jogamp/java3d/ExceptionStrings.properties
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngine.java
index f81fe4f..a9d6187 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngine.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.jogamp.java3d.audioengines;
 
-import javax.media.j3d.AudioDevice;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.Sound;
+import org.jogamp.java3d.AudioDevice;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.Sound;
 
 /**
  * The AudioEngine Class defines an audio output device that generates
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngine3D.java
index dcf334a..7209a0c 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngine3D.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.jogamp.java3d.audioengines;
 
 import java.util.ArrayList;
 
-import javax.media.j3d.AudioDevice3D;
-import javax.media.j3d.MediaContainer;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.AudioDevice3D;
+import org.jogamp.java3d.MediaContainer;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngine3DL2.java
index 1bffd52..c441063 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngine3DL2.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.jogamp.java3d.audioengines;
 
-import javax.media.j3d.AudioDevice3DL2;
-import javax.media.j3d.AuralAttributes;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.Sound;
+import org.jogamp.java3d.AudioDevice3DL2;
+import org.jogamp.java3d.AuralAttributes;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.Sound;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngineThread.java
index be16a6e..eece565 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/AudioEngineThread.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.jogamp.java3d.audioengines;
 
 /*
  * Audio Engine Thread
diff --git a/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java b/src/classes/share/org/jogamp/java3d/audioengines/AuralParameters.java
index f2d4627..c44b148 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/AuralParameters.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines;
+package org.jogamp.java3d.audioengines;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/audioengines/Sample.java b/src/classes/share/org/jogamp/java3d/audioengines/Sample.java
index 3506dc8..0bd5758 100644
--- a/src/classes/share/com/sun/j3d/audioengines/Sample.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/Sample.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.audioengines;
-
-import javax.media.j3d.MediaContainer;
-import javax.media.j3d.Sound;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.audioengines;
+
+import org.jogamp.java3d.MediaContainer;
+import org.jogamp.java3d.Sound;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * The Sample class defines the data and methods associated with a sound
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSAuralParameters.java
index 1f1240c..7d154a3 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSAuralParameters.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
 
 /**
@@ -45,7 +45,7 @@ package com.sun.j3d.audioengines.javasound;
  * These are explicitly maintained for HaeSoundMixer
  */
 
-public class JSAuralParameters extends com.sun.j3d.audioengines.AuralParameters {
+public class JSAuralParameters extends org.jogamp.java3d.audioengines.AuralParameters {
 
     /**
      * Reverb Parameters
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSChannel.java
index 06457df..8d6d8c6 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSChannel.java
@@ -42,7 +42,7 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
 // import java.applet.*;
 import java.io.InputStream;
@@ -53,7 +53,7 @@ import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.DataLine;
 
-import com.sun.j3d.audioengines.Sample;
+import org.jogamp.java3d.audioengines.Sample;
 
 /**
  * The JSChannel Class defines an audio output methods that call JavaSound
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSClip.java
index ba988c0..68a84f7 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSClip.java
@@ -42,7 +42,7 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSDirectionalSample.java
index 05796c5..a3b1b80 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSDirectionalSample.java
@@ -44,12 +44,12 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.audioengines.AuralParameters;
+import org.jogamp.java3d.audioengines.AuralParameters;
 
 /**
  * The PostionalSample Class defines the data and methods associated with a
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSMidi.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSMidi.java
index 1e99e89..3ccadba 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSMidi.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSMidi.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
 /**
  * The JSMidi class defines audio output methods that call the JavaSound
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSPositionalSample.java
index 70519cc..79bcf14 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSPositionalSample.java
@@ -44,16 +44,16 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
-import javax.media.j3d.PhysicalBody;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.PhysicalBody;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.audioengines.AuralParameters;
+import org.jogamp.java3d.audioengines.AuralParameters;
 
 /**
  * The PostionalSample Class defines the data and methods associated with a
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSSample.java
index c904b8c..83c7db5 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSSample.java
@@ -44,23 +44,23 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
 import java.io.InputStream;
 import java.net.URL;
 
-import javax.media.j3d.MediaContainer;
-import javax.media.j3d.View;
+import org.jogamp.java3d.MediaContainer;
+import org.jogamp.java3d.View;
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.DataLine;
 
-import com.sun.j3d.audioengines.AuralParameters;
+import org.jogamp.java3d.audioengines.AuralParameters;
 
 /**
  * The Sample Class extended for Java Sound Mixer specific audio device.
  */
 
-class JSSample extends com.sun.j3d.audioengines.Sample
+class JSSample extends org.jogamp.java3d.audioengines.Sample
 {
     /*
      * NOTE: for this device type there is exactly one sample associated
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSStream.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSStream.java
index 22a87bc..a243a33 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSStream.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
 /**
  * The JSStream class defines audio output methods that call the JavaSound
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSThread.java
index 0d5a090..e8a55c9 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JSThread.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.audioengines.javasound;
+package org.jogamp.java3d.audioengines.javasound;
 
 /*
  * JavaSound engine Thread
@@ -46,8 +46,8 @@ package com.sun.j3d.audioengines.javasound;
  * to be rewritten.  When this is done, we may or may not need this class.
  */
 
-import com.sun.j3d.audioengines.AudioEngine3D;
-import com.sun.j3d.audioengines.AudioEngine3DL2;
+import org.jogamp.java3d.audioengines.AudioEngine3D;
+import org.jogamp.java3d.audioengines.AudioEngine3DL2;
 
 /**
  * The Thread Class extended for JavaSound Mixer specific audio device
@@ -55,7 +55,7 @@ import com.sun.j3d.audioengines.AudioEngine3DL2;
  * such as volume/gain and sample-rate/frequency(pitch).
  */
 
-class JSThread extends com.sun.j3d.audioengines.AudioEngineThread {
+class JSThread extends org.jogamp.java3d.audioengines.AudioEngineThread {
 
     /**
      * The thread data for this thread
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JavaSoundMixer.java
index 1e96fee..f1691e9 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/JavaSoundMixer.java
@@ -44,18 +44,18 @@
  * to be rewritten.
  */
 
-package com.sun.j3d.audioengines.javasound;
-
-import javax.media.j3d.AudioDevice3D;
-import javax.media.j3d.MediaContainer;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.Sound;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
-
-import com.sun.j3d.audioengines.AudioEngine3DL2;
-import com.sun.j3d.audioengines.Sample;
+package org.jogamp.java3d.audioengines.javasound;
+
+import org.jogamp.java3d.AudioDevice3D;
+import org.jogamp.java3d.MediaContainer;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.Sound;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
+
+import org.jogamp.java3d.audioengines.AudioEngine3DL2;
+import org.jogamp.java3d.audioengines.Sample;
 
 /**
  * The JavaSoundMixer Class defines an audio output device that accesses
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/package.html b/src/classes/share/org/jogamp/java3d/audioengines/javasound/package.html
index 5897bc9..05122f4 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/package.html
+++ b/src/classes/share/org/jogamp/java3d/audioengines/javasound/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.audioengines.javasound</title>
+  <title>org.jogamp.java3d.audioengines.javasound</title>
 </head>
 <body>
 <p>Provides a JavaSound-based implementation of a Java 3D audio device.</p>
diff --git a/src/classes/share/com/sun/j3d/audioengines/package.html b/src/classes/share/org/jogamp/java3d/audioengines/package.html
index 59b80b4..4ad0001 100644
--- a/src/classes/share/com/sun/j3d/audioengines/package.html
+++ b/src/classes/share/org/jogamp/java3d/audioengines/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.audioengines</title>
+  <title>org.jogamp.java3d.audioengines</title>
 </head>
 <body>
 <p>Provides abstract classes for creating Java 3D audio devices.</p>
diff --git a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java b/src/classes/share/org/jogamp/java3d/exp/swing/JCanvas3D.java
index e089626..41078af 100644
--- a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java
+++ b/src/classes/share/org/jogamp/java3d/exp/swing/JCanvas3D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.exp.swing;
+package org.jogamp.java3d.exp.swing;
 
 import java.awt.Dimension;
 import java.awt.EventQueue;
@@ -49,12 +49,12 @@ import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.lang.reflect.InvocationTargetException;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.GraphicsConfigTemplate3D;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.GraphicsConfigTemplate3D;
 import javax.swing.JPanel;
 import javax.swing.event.AncestorListener;
 
-import com.sun.j3d.exp.swing.impl.AutoOffScreenCanvas3D;
+import org.jogamp.java3d.exp.swing.impl.AutoOffScreenCanvas3D;
 
 
 /**
@@ -117,7 +117,7 @@ public class JCanvas3D extends JPanel implements AncestorListener {
      */
     public final static int RESIZE_DELAYED = 1;
 
-    //TODO: FBA: this had been taken from javax.media.j3d.Screen3D. When/IF proper dpi handling comes one day, that part will have to be changed also for consistency
+    //TODO: FBA: this had been taken from org.jogamp.java3d.Screen3D. When/IF proper dpi handling comes one day, that part will have to be changed also for consistency
     /** size of a pixel */
     private static double METERS_PER_PIXEL = 0.0254 / 90.0;
 
@@ -339,7 +339,7 @@ public class JCanvas3D extends JPanel implements AncestorListener {
         //        this.canvas.setDoubleBufferEnable( false );
         java.awt.image.BufferedImage bImage = new java.awt.image.BufferedImage(width,
                 height, java.awt.image.BufferedImage.TYPE_INT_ARGB);
-        javax.media.j3d.ImageComponent2D image = new javax.media.j3d.ImageComponent2D(javax.media.j3d.ImageComponent2D.FORMAT_RGBA8,
+        org.jogamp.java3d.ImageComponent2D image = new org.jogamp.java3d.ImageComponent2D(org.jogamp.java3d.ImageComponent2D.FORMAT_RGBA8,
                 bImage, true, false );
         image.setCapability(image.ALLOW_IMAGE_READ);
         image.setCapability(image.ALLOW_IMAGE_WRITE);
diff --git a/src/classes/share/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java b/src/classes/share/org/jogamp/java3d/exp/swing/impl/AutoOffScreenCanvas3D.java
index 140de33..6e87725 100644
--- a/src/classes/share/com/sun/j3d/exp/swing/impl/AutoOffScreenCanvas3D.java
+++ b/src/classes/share/org/jogamp/java3d/exp/swing/impl/AutoOffScreenCanvas3D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.exp.swing.impl;
+package org.jogamp.java3d.exp.swing.impl;
 
 /**
  * Tagging interface for Java 3D off-screen Canvas3D objects that are
@@ -51,4 +51,4 @@ package com.sun.j3d.exp.swing.impl;
  *
  * @since Java 3D 1.5
  */
-public interface AutoOffScreenCanvas3D extends javax.media.j3d.AutoOffScreenCanvas3D {}
+public interface AutoOffScreenCanvas3D extends org.jogamp.java3d.AutoOffScreenCanvas3D {}
diff --git a/src/classes/share/com/sun/j3d/exp/swing/package.html b/src/classes/share/org/jogamp/java3d/exp/swing/package.html
index e1cff44..8b1db83 100644
--- a/src/classes/share/com/sun/j3d/exp/swing/package.html
+++ b/src/classes/share/org/jogamp/java3d/exp/swing/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.exp.swing</title>
+  <title>org.jogamp.java3d.exp.swing</title>
 </head>
 <body>
 <p><i>EXPERIMENTAL</i>: Provides a lightweight JCanvas3D class.
diff --git a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java b/src/classes/share/org/jogamp/java3d/internal/BufferWrapper.java
index 4dd43b1..f121cee 100644
--- a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java
+++ b/src/classes/share/org/jogamp/java3d/internal/BufferWrapper.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
 import java.nio.Buffer;
 
-import javax.media.j3d.J3DBuffer;
+import org.jogamp.java3d.J3DBuffer;
 
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
diff --git a/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java b/src/classes/share/org/jogamp/java3d/internal/ByteBufferWrapper.java
index 9d30fa9..e4d0897 100644
--- a/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java
+++ b/src/classes/share/org/jogamp/java3d/internal/ByteBufferWrapper.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import javax.media.j3d.J3DBuffer;
+import org.jogamp.java3d.J3DBuffer;
 
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
@@ -69,7 +69,7 @@ public class ByteBufferWrapper extends BufferWrapper {
 
     /**
      * Constructor initializes buffer with a
-     * javax.media.j3d.J3DBuffer object.
+     * org.jogamp.java3d.J3DBuffer object.
      */
     public ByteBufferWrapper(J3DBuffer b) {
 	buffer = (ByteBuffer)(b.getBuffer());
diff --git a/src/classes/share/com/sun/j3d/internal/Distance.java b/src/classes/share/org/jogamp/java3d/internal/Distance.java
index bb60d31..d5a7bfc 100644
--- a/src/classes/share/com/sun/j3d/internal/Distance.java
+++ b/src/classes/share/org/jogamp/java3d/internal/Distance.java
@@ -53,10 +53,10 @@
 //
 // --------------------------------------------------
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * Utility class used to calculate distance. Contains static methods
diff --git a/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java b/src/classes/share/org/jogamp/java3d/internal/DoubleBufferWrapper.java
index 0ef14f0..952486e 100644
--- a/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java
+++ b/src/classes/share/org/jogamp/java3d/internal/DoubleBufferWrapper.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
 import java.nio.DoubleBuffer;
 
-import javax.media.j3d.J3DBuffer;
+import org.jogamp.java3d.J3DBuffer;
 
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
@@ -68,7 +68,7 @@ public class DoubleBufferWrapper extends BufferWrapper {
 
     /**
      * Constructor initializes buffer with a
-     * javax.media.j3d.J3DBuffer object.
+     * org.jogamp.java3d.J3DBuffer object.
      */
     public DoubleBufferWrapper(J3DBuffer b) {
         buffer = (DoubleBuffer)(b.getBuffer());
diff --git a/src/classes/share/com/sun/j3d/internal/FastVector.java b/src/classes/share/org/jogamp/java3d/internal/FastVector.java
index a9d168f..271c2ac 100644
--- a/src/classes/share/com/sun/j3d/internal/FastVector.java
+++ b/src/classes/share/org/jogamp/java3d/internal/FastVector.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
 /**
  * The FastVector object is a growable array of ints.  It's much faster
diff --git a/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java b/src/classes/share/org/jogamp/java3d/internal/FloatBufferWrapper.java
index 6c7badf..8e84c82 100644
--- a/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java
+++ b/src/classes/share/org/jogamp/java3d/internal/FloatBufferWrapper.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
 import java.nio.FloatBuffer;
 
-import javax.media.j3d.J3DBuffer;
+import org.jogamp.java3d.J3DBuffer;
 
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
@@ -68,9 +68,9 @@ public class FloatBufferWrapper extends BufferWrapper {
 
     /**
      * Constructor initializes buffer with a
-     * javax.media.j3d.J3DBuffer object.
+     * org.jogamp.java3d.J3DBuffer object.
      */
-    public FloatBufferWrapper(javax.media.j3d.J3DBuffer b) {
+    public FloatBufferWrapper(org.jogamp.java3d.J3DBuffer b) {
         this.buffer = (FloatBuffer)(b.getBuffer());
     }
 
diff --git a/src/classes/share/com/sun/j3d/internal/HashCodeUtil.java b/src/classes/share/org/jogamp/java3d/internal/HashCodeUtil.java
index bb59aae..3ad6a8f 100644
--- a/src/classes/share/com/sun/j3d/internal/HashCodeUtil.java
+++ b/src/classes/share/org/jogamp/java3d/internal/HashCodeUtil.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
 /**
  * Utility class used when computing the hash code for
diff --git a/src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java b/src/classes/share/org/jogamp/java3d/internal/J3dUtilsI18N.java
index 32c052b..8961ba7 100644
--- a/src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java
+++ b/src/classes/share/org/jogamp/java3d/internal/J3dUtilsI18N.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.internal;
+package org.jogamp.java3d.internal;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -47,7 +47,7 @@ public class J3dUtilsI18N {
    static public String getString(String key) {
 	String s;
 	try {
-	    s = ResourceBundle.getBundle("com.sun.j3d.ExceptionStrings").getString(key);
+	    s = ResourceBundle.getBundle("org.jogamp.java3d.ExceptionStrings").getString(key);
 	}
 	catch (MissingResourceException e) {
 	    System.err.println("J3dUtilsI18N: Error looking up: " + key);
diff --git a/src/classes/share/com/sun/j3d/loaders/IncorrectFormatException.java b/src/classes/share/org/jogamp/java3d/loaders/IncorrectFormatException.java
index 6926e86..35a0231 100644
--- a/src/classes/share/com/sun/j3d/loaders/IncorrectFormatException.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/IncorrectFormatException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.jogamp.java3d.loaders;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/Loader.java b/src/classes/share/org/jogamp/java3d/loaders/Loader.java
index a2634c7..83c876a 100644
--- a/src/classes/share/com/sun/j3d/loaders/Loader.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/Loader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.jogamp.java3d.loaders;
 
 import java.io.FileNotFoundException;
 import java.io.Reader;
@@ -52,7 +52,7 @@ import java.net.URL;
  * the user a consistent interface to extract the
  * data.
  *
- * @see com.sun.j3d.loaders.Scene
+ * @see org.jogamp.java3d.loaders.Scene
  */
 public interface Loader {
 
diff --git a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java b/src/classes/share/org/jogamp/java3d/loaders/LoaderBase.java
index ec12cb4..ad679a8 100644
--- a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/LoaderBase.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.jogamp.java3d.loaders;
 
 import java.net.URL;
 
diff --git a/src/classes/share/com/sun/j3d/loaders/ParsingErrorException.java b/src/classes/share/org/jogamp/java3d/loaders/ParsingErrorException.java
index f046b58..05166f7 100644
--- a/src/classes/share/com/sun/j3d/loaders/ParsingErrorException.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/ParsingErrorException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.jogamp.java3d.loaders;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/Scene.java b/src/classes/share/org/jogamp/java3d/loaders/Scene.java
index 901a9ca..e9630be 100644
--- a/src/classes/share/com/sun/j3d/loaders/Scene.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/Scene.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.jogamp.java3d.loaders;
 
 import java.util.Hashtable;
 
-import javax.media.j3d.Background;
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Fog;
-import javax.media.j3d.Light;
-import javax.media.j3d.Sound;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Background;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Fog;
+import org.jogamp.java3d.Light;
+import org.jogamp.java3d.Sound;
+import org.jogamp.java3d.TransformGroup;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/SceneBase.java b/src/classes/share/org/jogamp/java3d/loaders/SceneBase.java
index bb3794d..8233e0a 100644
--- a/src/classes/share/com/sun/j3d/loaders/SceneBase.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/SceneBase.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.loaders;
+package org.jogamp.java3d.loaders;
 
 import java.util.Hashtable;
 import java.util.Vector;
 
-import javax.media.j3d.Background;
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Fog;
-import javax.media.j3d.Light;
-import javax.media.j3d.Sound;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Background;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Fog;
+import org.jogamp.java3d.Light;
+import org.jogamp.java3d.Sound;
+import org.jogamp.java3d.TransformGroup;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/DebugOutput.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/DebugOutput.java
index e78540d..7395307 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/DebugOutput.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/DebugOutput.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/EnvelopeHandler.java
index c5a3daf..a9eecba 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/EnvelopeHandler.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.io.StreamTokenizer;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 
 /**
@@ -72,7 +72,7 @@ class EnvelopeHandler extends TextfileParser {
     EnvelopeHandler(StreamTokenizer st,
         int totalFrames, float totalTime) {
         this(st, totalFrames, totalTime,
-	     "com.sun.j3d.utils.loaders.lw3d.LwsEnvelope");
+	     "org.jogamp.java3d.utils.loaders.lw3d.LwsEnvelope");
     }
 
 	/**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/FloatValueInterpolator.java
index 2b52e07..c728d40 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/FloatValueInterpolator.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Interpolator;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Interpolator;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * This class acts as an interpolator between values specified in a
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/ImageScaler.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/ImageScaler.java
index 7a7ff2f..6c54e26 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/ImageScaler.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/ImageScaler.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 import java.awt.Image;
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/J3dLwoParser.java
index ea8e048..4ffe5d3 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/J3dLwoParser.java
@@ -37,29 +37,29 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.io.FileNotFoundException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.ColoringAttributes;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.Material;
-import javax.media.j3d.PointAttributes;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureAttributes;
-import javax.media.j3d.TransparencyAttributes;
-import javax.vecmath.Color3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.ColoringAttributes;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.PointAttributes;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.TransparencyAttributes;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.utils.geometry.GeometryInfo;
-import com.sun.j3d.utils.geometry.NormalGenerator;
-import com.sun.j3d.utils.geometry.Stripifier;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.utils.geometry.GeometryInfo;
+import org.jogamp.java3d.utils.geometry.NormalGenerator;
+import org.jogamp.java3d.utils.geometry.Stripifier;
 
 
 /**
@@ -115,7 +115,7 @@ class J3dLwoParser extends LwoParser {
 
 	for (Enumeration e = shapeList.elements();
 	     e.hasMoreElements() ;) {
-	    int vertexFormat = javax.media.j3d.GeometryArray.COORDINATES;
+	    int vertexFormat = org.jogamp.java3d.GeometryArray.COORDINATES;
 	    ShapeHolder shape = (ShapeHolder)e.nextElement();
 	    debugOutputLn(LINE_TRACE, "about to create Arrays for Shape");
 	    debugOutputLn(VALUES, "shape = " + shape);
@@ -158,7 +158,7 @@ class J3dLwoParser extends LwoParser {
 		// This case happens if the objects are points
 		// Note that points are colored, not lit
 		object = new
-		    javax.media.j3d.PointArray(vertexCount, vertexFormat);
+		    org.jogamp.java3d.PointArray(vertexCount, vertexFormat);
 		object.setCoordinates(0, shape.coordsArray);
 		ColoringAttributes colorAtt =
 		    new ColoringAttributes(surf.getColor(),
@@ -173,7 +173,7 @@ class J3dLwoParser extends LwoParser {
 		// This case happens if the objects are lines
 		// Note that lines are colored, not lit
 		debugOutputLn(LINE_TRACE, "Creating IndexedLineArray");
-		object = new javax.media.j3d.LineArray(vertexCount,
+		object = new org.jogamp.java3d.LineArray(vertexCount,
 						       vertexFormat);
 		object.setCoordinates(0, shape.coordsArray);
 		ColoringAttributes colorAtt =
@@ -185,7 +185,7 @@ class J3dLwoParser extends LwoParser {
 		// This is the case for any polygonal objects
 		debugOutputLn(LINE_TRACE, "Creating IndexedTriFanArray");
 				// create triFanArray
-		vertexFormat |= javax.media.j3d.GeometryArray.NORMALS;
+		vertexFormat |= org.jogamp.java3d.GeometryArray.NORMALS;
 
 		debugOutputLn(LINE_TRACE, "about to process vertices/indices, facetIndices = " +
 			      shape.facetIndices);
@@ -242,7 +242,7 @@ class J3dLwoParser extends LwoParser {
 				  vertexCount + ", " +
 				  shape.facetSizes.length);
 		    object = new
-			javax.media.j3d.TriangleFanArray(vertexCount,
+			org.jogamp.java3d.TriangleFanArray(vertexCount,
 							 vertexFormat,
 							 shape.facetSizes);
 		    object.setCoordinates(0, shape.coordsArray);
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LWOBFileReader.java
index dd3a755..80521be 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LWOBFileReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
@@ -46,7 +46,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 
 class LWOBFileReader extends BufferedInputStream {
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LightIntensityPathInterpolator.java
index aa5a4ff..8848b53 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LightIntensityPathInterpolator.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.util.Enumeration;
 
-import javax.media.j3d.Alpha;
+import org.jogamp.java3d.Alpha;
 
 /**
  * This Interpolator object modifies the intensity of a Light object
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/Lw3dLoader.java
index 300e0e2..7930825 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/Lw3dLoader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 import java.io.BufferedInputStream;
@@ -52,21 +52,21 @@ import java.net.URL;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.media.j3d.AmbientLight;
-import javax.media.j3d.Background;
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Fog;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.AmbientLight;
+import org.jogamp.java3d.Background;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Fog;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Point3d;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.Loader;
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.loaders.Scene;
-import com.sun.j3d.loaders.SceneBase;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.Loader;
+import org.jogamp.java3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.Scene;
+import org.jogamp.java3d.loaders.SceneBase;
 
 
 /**
@@ -116,7 +116,7 @@ public class Lw3dLoader extends TextfileParser implements Loader {
     /**
      * This constructor takes a flags word that specifies which types of
      * scenefile items should be loaded into the scene.  The possible
-     * values are specified in the com.sun.j3d.loaders.Loader class.
+     * values are specified in the org.jogamp.java3d.loaders.Loader class.
      */
     public Lw3dLoader(int flags) {
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwLightObject.java
index a1affc5..0d988eb 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwLightObject.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
-import javax.media.j3d.Light;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.Light;
+import org.jogamp.vecmath.Color3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwoParser.java
index 25f8ab7..4a4a551 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwoParser.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
@@ -47,8 +47,8 @@ import java.net.URL;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwoSurface.java
index fd23902..24528f2 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwoSurface.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.awt.Image;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Vector;
 
-import javax.vecmath.Color3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwoTexture.java
index 9249b02..6f06cc9 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwoTexture.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -45,13 +45,13 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Hashtable;
 
-import javax.media.j3d.Texture;
-import javax.media.j3d.Texture2D;
-import javax.vecmath.Color3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.Texture2D;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.utils.image.TextureLoader;
+import org.jogamp.java3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.utils.image.TextureLoader;
 
 /**
  * This class is responsible for parsing the binary data in an Object file
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsBackground.java
index cf548ea..93592e0 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsBackground.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
 
-import javax.media.j3d.Background;
-import javax.media.j3d.BoundingSphere;
-import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.Background;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Point3d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsCamera.java
index bef9f5d..dc8ff51 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsCamera.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
@@ -45,12 +45,12 @@ import java.io.IOException;
 import java.io.StreamTokenizer;
 import java.util.Vector;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Matrix4d;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Matrix4d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * This class parses the data in a Scene file related to the camera and
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsEnvelope.java
index 1e9fb86..f2fc836 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsEnvelope.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * This class is a superclass for any implementation of envelopes; the
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsEnvelopeFrame.java
index 0bd9145..9eef98a 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsEnvelopeFrame.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
index b8ff1b8..6c131c5 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
 import java.io.StreamTokenizer;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsFog.java
index 9c90ef5..b79583c 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsFog.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
 
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Fog;
-import javax.media.j3d.LinearFog;
-import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.Fog;
+import org.jogamp.java3d.LinearFog;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Point3d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsFrame.java
index 48ba728..3222fd4 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsFrame.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
 import java.io.StreamTokenizer;
 
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3d;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * This class is responsible for parsing the data in a Scene file
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsLight.java
index bd800dd..f48cb75 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsLight.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
@@ -45,21 +45,21 @@ import java.io.IOException;
 import java.io.StreamTokenizer;
 import java.util.Vector;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.DirectionalLight;
-import javax.media.j3d.Light;
-import javax.media.j3d.PointLight;
-import javax.media.j3d.SpotLight;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Color3f;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.DirectionalLight;
+import org.jogamp.java3d.Light;
+import org.jogamp.java3d.PointLight;
+import org.jogamp.java3d.SpotLight;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * This class creates a light object from the data in a Scene file. It
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsMotion.java
index 0aa7304..2d3df74 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsMotion.java
@@ -37,27 +37,27 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.io.StreamTokenizer;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
-
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.utils.behaviors.interpolators.KBKeyFrame;
-import com.sun.j3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Quat4f;
+
+import org.jogamp.java3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.utils.behaviors.interpolators.KBKeyFrame;
+import org.jogamp.java3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
 
 /**
  * This class is responsible for parsing the data in a Scene file related to
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsObject.java
index 555655e..7529bbc 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsObject.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 import java.io.File;
@@ -50,16 +50,16 @@ import java.util.Enumeration;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Group;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * An LwsObject is passed a handle to the text file that contains the scene
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsPrimitive.java
index f80d795..9ca455a 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/LwsPrimitive.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 
 
 import java.util.Vector;
 
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.TransformGroup;
 
 /**
  * This is an interface which is implemented by LwsObject,
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/ParserObject.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/ParserObject.java
index 95e1453..63dcc66 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/ParserObject.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/ParserObject.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 /**
  * This class is a superclass of the binary parsing classes. It provides
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/SequenceLine.java
index 8629c7e..5c475dd 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/SequenceLine.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -46,20 +46,20 @@ import java.io.StreamTokenizer;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Group;
-import javax.media.j3d.Link;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.SharedGroup;
-import javax.media.j3d.Switch;
-import javax.media.j3d.SwitchValueInterpolator;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Link;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.SharedGroup;
+import org.jogamp.java3d.Switch;
+import org.jogamp.java3d.SwitchValueInterpolator;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3d;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * This class was created to handle "sequence files", which allow
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/SequenceReader.java
index ac79dff..c774918 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/SequenceReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -47,13 +47,13 @@ import java.io.StreamTokenizer;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Switch;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.Switch;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3d;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * This class was created to read a special file format devised for
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/ShapeHolder.java
index 70d2d5f..dac091d 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/ShapeHolder.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.util.Vector;
 
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/SwitchPathInterpolator.java
index b52e1bf..218ebbf 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/SwitchPathInterpolator.java
@@ -37,15 +37,15 @@
  *
  */
 
- package com.sun.j3d.loaders.lw3d;
+ package org.jogamp.java3d.loaders.lw3d;
 
 
 import java.util.Enumeration;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Switch;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Switch;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * This class was used in conjunction with SequenceReader to create
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/TargaReader.java
index 617c710..55232a6 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/TargaReader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -48,8 +48,8 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * This class parses a standard Targa file and retrieves the image stored
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java b/src/classes/share/org/jogamp/java3d/loaders/lw3d/TextfileParser.java
index f0cc401..6cbf522 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/TextfileParser.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.loaders.lw3d;
+package org.jogamp.java3d.loaders.lw3d;
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 /**
  * This class is a superclass for most of the Lws* Scene-file parsing
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/package.html b/src/classes/share/org/jogamp/java3d/loaders/lw3d/package.html
index e87c100..241bf5b 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/package.html
+++ b/src/classes/share/org/jogamp/java3d/loaders/lw3d/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.loaders.lw3d</title>
+  <title>org.jogamp.java3d.loaders.lw3d</title>
 </head>
 <body>
 <p>Provides a Java 3D loader for Lightwave 3D scene files.</p>
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/DefaultMaterials.java b/src/classes/share/org/jogamp/java3d/loaders/objectfile/DefaultMaterials.java
index dfa102d..9c7c65d 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/DefaultMaterials.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/objectfile/DefaultMaterials.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.jogamp.java3d.loaders.objectfile;
 
 /**
  * This class provides default materials for the object file loader
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java b/src/classes/share/org/jogamp/java3d/loaders/objectfile/ObjectFile.java
index ac2aeef..0069ae5 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/objectfile/ObjectFile.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.jogamp.java3d.loaders.objectfile;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -51,20 +51,20 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Point3f;
-import javax.vecmath.TexCoord2f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.TexCoord2f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.Loader;
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.loaders.Scene;
-import com.sun.j3d.loaders.SceneBase;
-import com.sun.j3d.utils.geometry.GeometryInfo;
-import com.sun.j3d.utils.geometry.NormalGenerator;
-import com.sun.j3d.utils.geometry.Stripifier;
+import org.jogamp.java3d.loaders.IncorrectFormatException;
+import org.jogamp.java3d.loaders.Loader;
+import org.jogamp.java3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.Scene;
+import org.jogamp.java3d.loaders.SceneBase;
+import org.jogamp.java3d.utils.geometry.GeometryInfo;
+import org.jogamp.java3d.utils.geometry.NormalGenerator;
+import org.jogamp.java3d.utils.geometry.Stripifier;
 
 
 
@@ -603,7 +603,7 @@ public class ObjectFile implements Loader {
      * Constructor.
      *
      * @param flags The constants from above or from
-     * com.sun.j3d.loaders.Loader, possibly "or'ed" (|) together.
+     * org.jogamp.java3d.loaders.Loader, possibly "or'ed" (|) together.
      * @param radians Ignored if the vn token is present in the model (user
      * normals supplied).  Otherwise, crease angle to use within smoothing
      * groups, or within geometry groups if the s token isn't present either.
@@ -618,7 +618,7 @@ public class ObjectFile implements Loader {
      * Constructor.  Crease Angle set to default of
      * 44 degrees (see NormalGenerator utility for details).
      * @param flags The constants from above or from
-     * com.sun.j3d.loaders.Loader, possibly "or'ed" (|) together.
+     * org.jogamp.java3d.loaders.Loader, possibly "or'ed" (|) together.
      */
     public ObjectFile(int flags) {
 	this(flags, -1.0f);
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java b/src/classes/share/org/jogamp/java3d/loaders/objectfile/ObjectFileMaterials.java
index d294795..09c3660 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileMaterials.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/objectfile/ObjectFileMaterials.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.jogamp.java3d.loaders.objectfile;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -55,18 +55,18 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.Material;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.TexCoordGeneration;
-import javax.media.j3d.Texture2D;
-import javax.media.j3d.TransparencyAttributes;
-import javax.vecmath.Color3f;
-
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.utils.image.ImageException;
-import com.sun.j3d.utils.image.TextureLoader;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.TexCoordGeneration;
+import org.jogamp.java3d.Texture2D;
+import org.jogamp.java3d.TransparencyAttributes;
+import org.jogamp.vecmath.Color3f;
+
+import org.jogamp.java3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.utils.image.ImageException;
+import org.jogamp.java3d.utils.image.TextureLoader;
 
 
 class ObjectFileMaterials implements ImageObserver {
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java b/src/classes/share/org/jogamp/java3d/loaders/objectfile/ObjectFileParser.java
index b5a8426..1eb0990 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/objectfile/ObjectFileParser.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.jogamp.java3d.loaders.objectfile;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StreamTokenizer;
 
-import com.sun.j3d.loaders.ParsingErrorException;
+import org.jogamp.java3d.loaders.ParsingErrorException;
 
 class ObjectFileParser extends StreamTokenizer {
 
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java b/src/classes/share/org/jogamp/java3d/loaders/objectfile/RgbFile.java
index fe2446a..aff33c6 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java
+++ b/src/classes/share/org/jogamp/java3d/loaders/objectfile/RgbFile.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.loaders.objectfile;
+package org.jogamp.java3d.loaders.objectfile;
 
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/package.html b/src/classes/share/org/jogamp/java3d/loaders/objectfile/package.html
index 1171815..9930bb7 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/package.html
+++ b/src/classes/share/org/jogamp/java3d/loaders/objectfile/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.loaders.objectfile</title>
+  <title>org.jogamp.java3d.loaders.objectfile</title>
 </head>
 <body>
 <p>Provides a Java 3D loader for Wavefront .obj files.</p>
diff --git a/src/classes/share/com/sun/j3d/loaders/package.html b/src/classes/share/org/jogamp/java3d/loaders/package.html
index 6b38d00..c7a9f12 100644
--- a/src/classes/share/com/sun/j3d/loaders/package.html
+++ b/src/classes/share/org/jogamp/java3d/loaders/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.loaders</title>
+  <title>org.jogamp.java3d.loaders</title>
 </head>
 <body>
 <p>Provides interfaces and abstract classes for writing Java 3D loaders.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java b/src/classes/share/org/jogamp/java3d/utils/applet/JMainFrame.java
index 62541fd..80270d6 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java
+++ b/src/classes/share/org/jogamp/java3d/utils/applet/JMainFrame.java
@@ -67,7 +67,7 @@
 
 // ---------------------------------------------------------------------
 
-package com.sun.j3d.utils.applet;
+package org.jogamp.java3d.utils.applet;
 
 import java.applet.Applet;
 import java.applet.AppletContext;
diff --git a/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java b/src/classes/share/org/jogamp/java3d/utils/applet/MainFrame.java
index 3415bc2..348b4e1 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java
+++ b/src/classes/share/org/jogamp/java3d/utils/applet/MainFrame.java
@@ -67,7 +67,7 @@
 
 // ---------------------------------------------------------------------
 
-package com.sun.j3d.utils.applet;
+package org.jogamp.java3d.utils.applet;
 
 import java.applet.Applet;
 import java.applet.AppletContext;
diff --git a/src/classes/share/com/sun/j3d/utils/applet/package.html b/src/classes/share/org/jogamp/java3d/utils/applet/package.html
index 3e0334e..17fd1b1 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/applet/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.applet</title>
+  <title>org.jogamp.java3d.utils.applet</title>
 </head>
 <body>
 <p>Provides utility classes for running applets as stand-alone
diff --git a/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java b/src/classes/share/org/jogamp/java3d/utils/audio/DistanceAttenuation.java
index 5572ea3..8f14ff2 100644
--- a/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java
+++ b/src/classes/share/org/jogamp/java3d/utils/audio/DistanceAttenuation.java
@@ -44,12 +44,12 @@
   *  arrays.
   */
 
-package com.sun.j3d.utils.audio;
+package org.jogamp.java3d.utils.audio;
 
-import javax.media.j3d.SoundException;
-import javax.vecmath.Point2f;
+import org.jogamp.java3d.SoundException;
+import org.jogamp.vecmath.Point2f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 public class DistanceAttenuation
 {
diff --git a/src/classes/share/com/sun/j3d/utils/audio/package.html b/src/classes/share/org/jogamp/java3d/utils/audio/package.html
index c0ccbfc..ecb71e8 100644
--- a/src/classes/share/com/sun/j3d/utils/audio/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/audio/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.audio</title>
+  <title>org.jogamp.java3d.utils.audio</title>
 </head>
 <body>
 <p>Provides audio utility classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/CubicSplineCurve.java
index efc1d6b..6854c7f 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/CubicSplineCurve.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * CubicSplineCurve is a container class that holds a number of
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/CubicSplineSegment.java
index 63199af..6330474 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/CubicSplineSegment.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Quat4f;
+import org.jogamp.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
index 755dd78..b76c20e 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * KBCubicSplineCurve is a container class that holds a number of
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
index 62471c5..158c6cd 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBKeyFrame.java
index 46b1980..7fc665d 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBKeyFrame.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import javax.vecmath.Point3f;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * This class represents a Key Frame that can be used for Kochanek-Bartels
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
index 457a2ef..be52f5e 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
-
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.RestrictedAccessException;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.behaviors.interpolators;
+
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.RestrictedAccessException;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
index 5782a41..a3fe2cb 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.RestrictedAccessException;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.TransformInterpolator;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.RestrictedAccessException;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.TransformInterpolator;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * KBSplinePathInterpolator behavior.  This class defines the base class for
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
index ab856b2..a286608 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
-
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.RestrictedAccessException;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.behaviors.interpolators;
+
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.RestrictedAccessException;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Quat4f;
+import org.jogamp.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/TCBKeyFrame.java
index 2b5db45..262574a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/TCBKeyFrame.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Quat4f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * This class represents a Key Frame that can be used for Kochanek-Bartels
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
index b8fe090..fb6d0e0 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.RestrictedAccessException;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.TransformInterpolator;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.RestrictedAccessException;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.TransformInterpolator;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * TCBSplinePathInterpolator behavior.  This class defines the base class for
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/package.html b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/package.html
index 7f18f4a..19ef214 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/interpolators/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.behaviors.interpolators</title>
+  <title>org.jogamp.java3d.utils.behaviors.interpolators</title>
 </head>
 <body>
 <p>Provides spline-based interpolation behaviors.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/keyboard/KeyNavigator.java
index 1df3d62..6b44a61 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/keyboard/KeyNavigator.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.keyboard;
+package org.jogamp.java3d.utils.behaviors.keyboard;
 
 import java.awt.event.KeyEvent;
 
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Quat4d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Quat4d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * This is the KeyNavigator class.  It accumulates AWT key events (key
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
index 4d38238..78ecb41 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.keyboard;
+package org.jogamp.java3d.utils.behaviors.keyboard;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
@@ -46,16 +46,16 @@ import java.awt.event.KeyListener;
 import java.util.Enumeration;
 import java.util.LinkedList;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCondition;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOnBehaviorPost;
-import javax.media.j3d.WakeupOnElapsedFrames;
-import javax.media.j3d.WakeupOr;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCondition;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOnBehaviorPost;
+import org.jogamp.java3d.WakeupOnElapsedFrames;
+import org.jogamp.java3d.WakeupOr;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * This class is a simple behavior that invokes the KeyNavigator
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/package.html b/src/classes/share/org/jogamp/java3d/utils/behaviors/keyboard/package.html
index b22646e..efe76d5 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/keyboard/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.behaviors.keyboard</title>
+  <title>org.jogamp.java3d.utils.behaviors.keyboard</title>
 </head>
 <body>
 <p>Provides keyboard navigation utility classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseBehavior.java
index 73b2b25..cfc0c2c 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.behaviors.mouse;
 
 import java.awt.Component;
 import java.awt.event.MouseEvent;
@@ -48,15 +48,15 @@ import java.awt.event.MouseWheelListener;
 import java.util.Enumeration;
 import java.util.LinkedList;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOnBehaviorPost;
-import javax.media.j3d.WakeupOr;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOnBehaviorPost;
+import org.jogamp.java3d.WakeupOr;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseBehaviorCallback.java
index 29854a0..4965ccf 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorCallback.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseBehaviorCallback.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.behaviors.mouse;
 
-import javax.media.j3d.Transform3D;
+import org.jogamp.java3d.Transform3D;
 
 /**
  * The MouseBehaviorCallback interface allows a class to be notified
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseRotate.java
index 33aaba8..65f0c09 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseRotate.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOnBehaviorPost;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOnBehaviorPost;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * MouseRotate is a Java3D behavior object that lets users control the
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseTranslate.java
index f81366a..44bd43b 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseTranslate.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOnBehaviorPost;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOnBehaviorPost;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * MouseTranslate is a Java3D behavior object that lets users control the
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseWheelZoom.java
index 8d360b2..3e18bec 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseWheelZoom.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
@@ -45,12 +45,12 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 import java.util.Enumeration;
 
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOnBehaviorPost;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOnBehaviorPost;
+import org.jogamp.vecmath.Vector3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseZoom.java
index 86471a5..0e724e3 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/MouseZoom.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.behaviors.mouse;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOnBehaviorPost;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOnBehaviorPost;
+import org.jogamp.vecmath.Vector3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/package.html b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/package.html
index d943a49..6eb2142 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/mouse/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.behaviors.mouse</title>
+  <title>org.jogamp.java3d.utils.behaviors.mouse</title>
 </head>
 <body>
 <p>Provides mouse navigation utility classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/Intersect.java
index 6df1e7e..45002ab 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/Intersect.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.jogamp.java3d.utils.behaviors.picking;
 
-import javax.media.j3d.PickPoint;
-import javax.media.j3d.PickRay;
-import javax.media.j3d.PickSegment;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Tuple3d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.PickPoint;
+import org.jogamp.java3d.PickRay;
+import org.jogamp.java3d.PickSegment;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Tuple3d;
+import org.jogamp.vecmath.Vector3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /*
  * Contains static methods to aid in the intersection test between
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickMouseBehavior.java
index c64f731..b072ffa 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickMouseBehavior.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.jogamp.java3d.utils.behaviors.picking;
 
 import java.awt.AWTEvent;
 import java.awt.Event;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOr;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOr;
 
 
 /*
@@ -62,9 +62,9 @@ import javax.media.j3d.WakeupOr;
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * <code>com.sun.j3d.utils.picking.behaviors.PickMouseBehavior</code>
+ * <code>org.jogamp.java3d.utils.picking.behaviors.PickMouseBehavior</code>
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickMouseBehavior
+ * @see org.jogamp.java3d.utils.picking.behaviors.PickMouseBehavior
  */
 
 public abstract class PickMouseBehavior extends Behavior {
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickObject.java
index 9eae2ec..06adf7d 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickObject.java
@@ -76,26 +76,26 @@ Misc:
 
 	*/
 
-package com.sun.j3d.utils.behaviors.picking;
-
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Group;
-import javax.media.j3d.Link;
-import javax.media.j3d.Morph;
-import javax.media.j3d.Node;
-import javax.media.j3d.PickRay;
-import javax.media.j3d.PickShape;
-import javax.media.j3d.SceneGraphPath;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Switch;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.View;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
-
-import com.sun.j3d.utils.geometry.Primitive;
+package org.jogamp.java3d.utils.behaviors.picking;
+
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Link;
+import org.jogamp.java3d.Morph;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.PickRay;
+import org.jogamp.java3d.PickShape;
+import org.jogamp.java3d.SceneGraphPath;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Switch;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
+
+import org.jogamp.java3d.utils.geometry.Primitive;
 
 /*
  * Contains methods to aid in picking.  A PickObject is created
@@ -106,9 +106,9 @@ import com.sun.j3d.utils.geometry.Primitive;
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * <code>com.sun.j3d.utils.picking.PickCanvas</code>
+ * <code>org.jogamp.java3d.utils.picking.PickCanvas</code>
  *
- * @see com.sun.j3d.utils.picking.PickCanvas
+ * @see org.jogamp.java3d.utils.picking.PickCanvas
  */
 
 public class PickObject extends Object {
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickRotateBehavior.java
index 7e491e0..d962658 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickRotateBehavior.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.jogamp.java3d.utils.behaviors.picking;
 
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseRotate;
 
 /*
  * A mouse behavior that allows user to pick and drag scene graph objects.
@@ -69,9 +69,9 @@ import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * <code>com.sun.j3d.utils.picking.behaviors.PickRotateBehavior</code>
+ * <code>org.jogamp.java3d.utils.picking.behaviors.PickRotateBehavior</code>
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickRotateBehavior
+ * @see org.jogamp.java3d.utils.picking.behaviors.PickRotateBehavior
  */
 
 public class PickRotateBehavior extends PickMouseBehavior implements MouseBehaviorCallback {
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickTranslateBehavior.java
index 89b307a..0dac749 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickTranslateBehavior.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.jogamp.java3d.utils.behaviors.picking;
 
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseTranslate;
 
 // A mouse behavior that allows user to pick and translate scene graph objects.
 // Common usage: 1. Create your scene graph. 2. Create this behavior with
@@ -55,9 +55,9 @@ import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * <code>com.sun.j3d.utils.picking.behaviors.PickTranslateBehavior</code>
+ * <code>org.jogamp.java3d.utils.picking.behaviors.PickTranslateBehavior</code>
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickTranslateBehavior
+ * @see org.jogamp.java3d.utils.picking.behaviors.PickTranslateBehavior
  */
 
 public class PickTranslateBehavior extends PickMouseBehavior implements MouseBehaviorCallback {
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickZoomBehavior.java
index c405451..2d78309 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickZoomBehavior.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.jogamp.java3d.utils.behaviors.picking;
 
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseZoom;
 
 
 // A mouse behavior that allows user to pick and zoom scene graph objects.
@@ -56,9 +56,9 @@ import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * <code>com.sun.j3d.utils.picking.behaviors.PickZoomBehavior</code>
+ * <code>org.jogamp.java3d.utils.picking.behaviors.PickZoomBehavior</code>
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickZoomBehavior
+ * @see org.jogamp.java3d.utils.picking.behaviors.PickZoomBehavior
  */
 
 public class PickZoomBehavior extends PickMouseBehavior implements MouseBehaviorCallback {
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickingCallback.java
index f2b625e..cc9f636 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickingCallback.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/PickingCallback.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.picking;
+package org.jogamp.java3d.utils.behaviors.picking;
 
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.TransformGroup;
 
 /**
  * @deprecated As of Java 3D version 1.2, replaced by
- * <code>com.sun.j3d.utils.picking.behaviors.PickingCallback</code>
+ * <code>org.jogamp.java3d.utils.picking.behaviors.PickingCallback</code>
  *
- * @see com.sun.j3d.utils.picking.behaviors.PickingCallback
+ * @see org.jogamp.java3d.utils.picking.behaviors.PickingCallback
  */
 
 public interface PickingCallback {
diff --git a/src/classes/share/com/sun/j3d/utils/compression/package.html b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/package.html
index 628453b..66a7fd0 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/picking/package.html
@@ -3,11 +3,11 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.compression</title>
+  <title>org.jogamp.java3d.utils.behaviors.picking</title>
 </head>
 <body>
 <p><i><b>Deprecated</b>: Use <code><a
- href="../geometry/compression/package-summary.html">com.sun.j3d.utils.geometry.compression</a></code>
+ href="../../pickfast/behaviors/package-summary.html">org.jogamp.java3d.utils.pickfast.behaviors</a></code>
 instead.</i></p>
 </body>
 </html>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
index 188840a..1ffea4f 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.jogamp.java3d.utils.behaviors.sensor ;
 
 import java.util.Enumeration;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Sensor;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCondition;
-import javax.media.j3d.WakeupOnElapsedFrames;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Sensor;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCondition;
+import org.jogamp.java3d.WakeupOnElapsedFrames;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * This class provides basic behavior for a 6DOF mouse sensor.  It
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorBeamEcho.java
index 7a98660..39b8d35 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorBeamEcho.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
-
-import javax.media.j3d.Appearance;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.Material;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransparencyAttributes;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.AxisAngle4f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.behaviors.sensor ;
+
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransparencyAttributes;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.AxisAngle4f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * A Shape3D representing a beam pointing from the origin of a
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorButtonListener.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorButtonListener.java
index 0b54985..bd3d39b 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorButtonListener.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorButtonListener.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.jogamp.java3d.utils.behaviors.sensor ;
 
 /**
  * This defines the interface for handling a sensor's button events in
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorEvent.java
index 980cda3..35cbb2a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorEvent.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.jogamp.java3d.utils.behaviors.sensor ;
 
-import javax.media.j3d.Sensor;
-import javax.media.j3d.Transform3D;
+import org.jogamp.java3d.Sensor;
+import org.jogamp.java3d.Transform3D;
 
 /**
  * This class defines the event object that is created by a
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorEventAgent.java
index dac15e3..6b71f17 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorEventAgent.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.jogamp.java3d.utils.behaviors.sensor ;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.media.j3d.Sensor;
-import javax.media.j3d.Transform3D;
+import org.jogamp.java3d.Sensor;
+import org.jogamp.java3d.Transform3D;
 
-import com.sun.j3d.utils.timer.J3DTimer;
+import org.jogamp.java3d.utils.timer.J3DTimer;
 
 /**
  * This class works in conjunction with the <code>SensorButtonListener</code>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorGnomonEcho.java
index 90ba7cf..47f5799 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorGnomonEcho.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
-
-import javax.media.j3d.Appearance;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.Material;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransparencyAttributes;
-import javax.media.j3d.TriangleArray;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.behaviors.sensor ;
+
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransparencyAttributes;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * A Shape3D representing a gnomon pointing along each coordinate
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorInputAdaptor.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorInputAdaptor.java
index cee6c02..7ffcf43 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorInputAdaptor.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorInputAdaptor.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.jogamp.java3d.utils.behaviors.sensor ;
 
 /**
  * The adaptor which receives sensor button and read events.  The methods
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorReadListener.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorReadListener.java
index f2f440c..18dc892 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorReadListener.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/SensorReadListener.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.sensor ;
+package org.jogamp.java3d.utils.behaviors.sensor ;
 
 /**
  * This defines the interface for handling a sensor's read events in
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/package.html b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/package.html
index 25c9b13..754890d 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/sensor/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.behaviors.sensor</title>
+  <title>org.jogamp.java3d.utils.behaviors.sensor</title>
 </head>
 <body>
 <p>Provides 6DOF sensor behavior classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/OrbitBehavior.java
index b046096..9460efd 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/OrbitBehavior.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp;
+package org.jogamp.java3d.utils.behaviors.vp;
 
 import java.awt.AWTEvent;
 import java.awt.event.MouseEvent;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Matrix3d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Matrix3d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.utils.universe.ViewingPlatform;
 
 /**
  * Moves the View around a point of interest when the mouse is dragged with
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
index 5c2a5e1..f0c84a1 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp;
+package org.jogamp.java3d.utils.behaviors.vp;
 
 import java.awt.AWTEvent;
 import java.awt.event.KeyListener;
@@ -47,14 +47,14 @@ import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelListener;
 import java.util.ArrayList;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.WakeupCondition;
-import javax.media.j3d.WakeupOnBehaviorPost;
-import javax.media.j3d.WakeupOnElapsedFrames;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.WakeupCondition;
+import org.jogamp.java3d.WakeupOnBehaviorPost;
+import org.jogamp.java3d.WakeupOnElapsedFrames;
 
-import com.sun.j3d.utils.universe.Viewer;
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.jogamp.java3d.utils.universe.Viewer;
+import org.jogamp.java3d.utils.universe.ViewingPlatform;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/ViewPlatformBehavior.java
index 5518eeb..ea9bfc1 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/ViewPlatformBehavior.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp;
+package org.jogamp.java3d.utils.behaviors.vp;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.jogamp.java3d.utils.universe.ViewingPlatform;
 
 /**
  * Abstract class for ViewPlatformBehaviors.  A ViewPlatformBehavior must
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/WandViewBehavior.java
index c84ab0c..3dfe7ce 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/WandViewBehavior.java
@@ -37,44 +37,44 @@
  *
  */
 
-package com.sun.j3d.utils.behaviors.vp ;
+package org.jogamp.java3d.utils.behaviors.vp ;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Map;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.BadTransformException;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Group;
-import javax.media.j3d.Material;
-import javax.media.j3d.Sensor;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.TransparencyAttributes;
-import javax.media.j3d.View;
-import javax.media.j3d.WakeupCondition;
-import javax.media.j3d.WakeupOnElapsedFrames;
-import javax.vecmath.AxisAngle4d;
-import javax.vecmath.Color3f;
-import javax.vecmath.Matrix3d;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
-
-import com.sun.j3d.utils.behaviors.sensor.SensorBeamEcho;
-import com.sun.j3d.utils.behaviors.sensor.SensorButtonListener;
-import com.sun.j3d.utils.behaviors.sensor.SensorEvent;
-import com.sun.j3d.utils.behaviors.sensor.SensorEventAgent;
-import com.sun.j3d.utils.behaviors.sensor.SensorGnomonEcho;
-import com.sun.j3d.utils.behaviors.sensor.SensorInputAdaptor;
-import com.sun.j3d.utils.behaviors.sensor.SensorReadListener;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
-import com.sun.j3d.utils.universe.SimpleUniverse;
-import com.sun.j3d.utils.universe.Viewer;
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.BadTransformException;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.Sensor;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.TransparencyAttributes;
+import org.jogamp.java3d.View;
+import org.jogamp.java3d.WakeupCondition;
+import org.jogamp.java3d.WakeupOnElapsedFrames;
+import org.jogamp.vecmath.AxisAngle4d;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Matrix3d;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
+
+import org.jogamp.java3d.utils.behaviors.sensor.SensorBeamEcho;
+import org.jogamp.java3d.utils.behaviors.sensor.SensorButtonListener;
+import org.jogamp.java3d.utils.behaviors.sensor.SensorEvent;
+import org.jogamp.java3d.utils.behaviors.sensor.SensorEventAgent;
+import org.jogamp.java3d.utils.behaviors.sensor.SensorGnomonEcho;
+import org.jogamp.java3d.utils.behaviors.sensor.SensorInputAdaptor;
+import org.jogamp.java3d.utils.behaviors.sensor.SensorReadListener;
+import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
+import org.jogamp.java3d.utils.universe.SimpleUniverse;
+import org.jogamp.java3d.utils.universe.Viewer;
+import org.jogamp.java3d.utils.universe.ViewingPlatform;
 
 /**
  * Manipulates view platform transforms using a motion-tracked wand or mouse
@@ -435,7 +435,7 @@ public class WandViewBehavior extends ViewPlatformBehavior {
      * behavior is instantiated from a configuration file.
      * <p>
      * <b>Syntax:</b><br>(NewViewPlatformBehavior <i>&lt;name&gt;</i>
-     * com.sun.j3d.utils.behaviors.vp.WandViewBehavior)
+     * org.jogamp.java3d.utils.behaviors.vp.WandViewBehavior)
      */
     public WandViewBehavior() {
         // Create an event agent.
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/package.html b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/package.html
index 4900193..81534d3 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/behaviors/vp/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.behaviors.vp</title>
+  <title>org.jogamp.java3d.utils.behaviors.vp</title>
 </head>
 <body>
 <p>Provides ViewPlatform navigation utility classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CommandStream.java b/src/classes/share/org/jogamp/java3d/utils/compression/CommandStream.java
index 3eae922..1c19594 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CommandStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/CommandStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
 /**
  * This class is used to build the bit-level compression command stream which
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java b/src/classes/share/org/jogamp/java3d/utils/compression/CompressedGeometryFile.java
index 87d0d75..1bd7e87 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/CompressedGeometryFile.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import javax.media.j3d.CapabilityNotSetException;
-import javax.media.j3d.CompressedGeometry;
-import javax.media.j3d.CompressedGeometryHeader;
+import org.jogamp.java3d.CapabilityNotSetException;
+import org.jogamp.java3d.CompressedGeometry;
+import org.jogamp.java3d.CompressedGeometryHeader;
 
 //
 // The compressed geometry file format supported by this class has a 32
@@ -67,7 +67,7 @@ import javax.media.j3d.CompressedGeometryHeader;
  * objects.
  *
  * @deprecated As of Java 3D 1.5, replaced by
- * com.sun.j3d.utils.geometry.compression.{@link com.sun.j3d.utils.geometry.compression.CompressedGeometryFile}.
+ * org.jogamp.java3d.utils.geometry.compression.{@link org.jogamp.java3d.utils.geometry.compression.CompressedGeometryFile}.
  */
 public class CompressedGeometryFile {
     private static final boolean print = false ;
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStream.java
index 10e12ba..38958b6 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
@@ -46,37 +46,37 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.CompressedGeometryHeader;
-import javax.media.j3d.Geometry;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.IndexedGeometryStripArray;
-import javax.media.j3d.IndexedLineArray;
-import javax.media.j3d.IndexedLineStripArray;
-import javax.media.j3d.IndexedQuadArray;
-import javax.media.j3d.IndexedTriangleArray;
-import javax.media.j3d.IndexedTriangleFanArray;
-import javax.media.j3d.IndexedTriangleStripArray;
-import javax.media.j3d.J3DBuffer;
-import javax.media.j3d.LineArray;
-import javax.media.j3d.LineStripArray;
-import javax.media.j3d.Material;
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Point3i;
-import javax.vecmath.Vector3f;
-
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.utils.geometry.GeometryInfo;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.CompressedGeometryHeader;
+import org.jogamp.java3d.Geometry;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.GeometryStripArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.IndexedGeometryStripArray;
+import org.jogamp.java3d.IndexedLineArray;
+import org.jogamp.java3d.IndexedLineStripArray;
+import org.jogamp.java3d.IndexedQuadArray;
+import org.jogamp.java3d.IndexedTriangleArray;
+import org.jogamp.java3d.IndexedTriangleFanArray;
+import org.jogamp.java3d.IndexedTriangleStripArray;
+import org.jogamp.java3d.J3DBuffer;
+import org.jogamp.java3d.LineArray;
+import org.jogamp.java3d.LineStripArray;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleFanArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Point3i;
+import org.jogamp.vecmath.Vector3f;
+
+import org.jogamp.java3d.internal.BufferWrapper;
+import org.jogamp.java3d.utils.geometry.GeometryInfo;
 
 /**
  * This class is used as input to a geometry compressor.  It collects elements
@@ -87,7 +87,7 @@ import com.sun.j3d.utils.geometry.GeometryInfo;
  * @see GeometryCompressor
  *
  * @deprecated As of Java 3D 1.5, replaced by
- * com.sun.j3d.utils.geometry.compression.{@link com.sun.j3d.utils.geometry.compression.CompressionStream}.
+ * org.jogamp.java3d.utils.geometry.compression.{@link org.jogamp.java3d.utils.geometry.compression.CompressionStream}.
  */
 public class CompressionStream {
     //
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamColor.java
index ad9263b..c8c18be 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamColor.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamColor.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.compression;
 
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
 
 /**
  * This class represents a color in a compression stream. It maintains both
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamElement.java b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamElement.java
index ed98617..5d7cede 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamElement.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamElement.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
 /**
  * Instances of this class are used as elements in a CompressionStream.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamNormal.java b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamNormal.java
index 10b8704..2dc99c3 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamNormal.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamNormal.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.compression;
 
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * This class represents a normal in a compression stream. It maintains both
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamVertex.java b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamVertex.java
index 906c107..3a5d12b 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamVertex.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/CompressionStreamVertex.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * This class represents a vertex in a compression stream.  It maintains both
diff --git a/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java b/src/classes/share/org/jogamp/java3d/utils/compression/GeometryCompressor.java
index d3fda17..39b83f7 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/GeometryCompressor.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
 import java.io.IOException;
 
-import javax.media.j3d.CompressedGeometry;
-import javax.media.j3d.CompressedGeometryHeader;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.CompressedGeometry;
+import org.jogamp.java3d.CompressedGeometryHeader;
+import org.jogamp.vecmath.Point3d;
 
 /**
  * A GeometryCompressor takes a stream of geometric elements and
@@ -58,7 +58,7 @@ import javax.vecmath.Point3d;
  * @see CompressedGeometryFile
  *
  * @deprecated As of Java 3D 1.5, replaced by
- * com.sun.j3d.utils.geometry.compression.{@link com.sun.j3d.utils.geometry.compression.GeometryCompressor}.
+ * org.jogamp.java3d.utils.geometry.compression.{@link org.jogamp.java3d.utils.geometry.compression.GeometryCompressor}.
  */
 public class GeometryCompressor {
     private static final boolean benchmark = false ;
diff --git a/src/classes/share/com/sun/j3d/utils/compression/HuffmanNode.java b/src/classes/share/org/jogamp/java3d/utils/compression/HuffmanNode.java
index a89eec8..00cf6ea 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/HuffmanNode.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/HuffmanNode.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
 import java.util.Collection;
 import java.util.Comparator;
diff --git a/src/classes/share/com/sun/j3d/utils/compression/HuffmanTable.java b/src/classes/share/org/jogamp/java3d/utils/compression/HuffmanTable.java
index 881a7ea..a947f5e 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/HuffmanTable.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/HuffmanTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java b/src/classes/share/org/jogamp/java3d/utils/compression/MeshBuffer.java
index 59701d1..130cb34 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/MeshBuffer.java
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/MeshBuffer.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.compression;
 
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * This class mirrors the vertex mesh buffer stack supported by the geometry
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/package.html b/src/classes/share/org/jogamp/java3d/utils/compression/package.html
index b5d0b77..639ad1a 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/compression/package.html
@@ -3,11 +3,11 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.behaviors.picking</title>
+  <title>org.jogamp.java3d.utils.compression</title>
 </head>
 <body>
 <p><i><b>Deprecated</b>: Use <code><a
- href="../../pickfast/behaviors/package-summary.html">com.sun.j3d.utils.pickfast.behaviors</a></code>
+ href="../geometry/compression/package-summary.html">org.jogamp.java3d.utils.geometry.compression</a></code>
 instead.</i></p>
 </body>
 </html>
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/BBox.java b/src/classes/share/org/jogamp/java3d/utils/geometry/BBox.java
index a08d3eb..7107851 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/BBox.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/BBox.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Basic.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Basic.java
index 77b3553..227e645 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Basic.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Basic.java
@@ -52,10 +52,10 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.vecmath.Tuple2f;
-import javax.vecmath.Tuple3f;
+import org.jogamp.vecmath.Tuple2f;
+import org.jogamp.vecmath.Tuple3f;
 
 class Basic {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java b/src/classes/share/org/jogamp/java3d/utils/geometry/BottleNeck.java
index 7087297..902753c 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/BottleNeck.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class BottleNeck {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Box.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Box.java
index 02124d7..4061412 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Box.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Box.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * Box is a geometry primitive created with a given length, width, and height.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Bridge.java
index 2dfb7ec..15051f3 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Bridge.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class Bridge {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Clean.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Clean.java
index d4137df..41a8804 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Clean.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Clean.java
@@ -52,9 +52,9 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.vecmath.Point2f;
+import org.jogamp.vecmath.Point2f;
 
 class Clean {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java b/src/classes/share/org/jogamp/java3d/utils/geometry/ColorCube.java
index c41c32e..ba9c05c 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/ColorCube.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.Shape3D;
 
 /**
  * Simple color-per-vertex cube with a different color for each face
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Cone.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Cone.java
index 39d9729..02d8f00 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Cone.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Cone.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.Shape3D;
 
 /**
  * Cone is a geometry primitive defined with a radius and a height.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Cylinder.java
index b40b27b..99eb458 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Cylinder.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.Shape3D;
 
 /**
  * Cylinder is a geometry primitive defined with a radius and a height.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Degenerate.java
index 960437f..5837058 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Degenerate.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class Degenerate {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Desperate.java
index 4bbcc66..e82a991 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Desperate.java
@@ -52,9 +52,9 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.vecmath.Point2f;
+import org.jogamp.vecmath.Point2f;
 
 class Desperate {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Distance.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Distance.java
index be3d3d1..7b5b59e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Distance.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Distance.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 class Distance extends Object {
     int ind;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java b/src/classes/share/org/jogamp/java3d/utils/geometry/EarClip.java
index d7be619..12ca16b 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/EarClip.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class EarClip {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Edge.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Edge.java
index 1841a0e..3f8ccbe 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Edge.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Edge.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 // Class created so that the two vertex indices that make up an
 // edge can be hashed.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java b/src/classes/share/org/jogamp/java3d/utils/geometry/EdgeTable.java
index 337f353..dc9180e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/EdgeTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java b/src/classes/share/org/jogamp/java3d/utils/geometry/GeomBuffer.java
index 57e4d96..f03e89a 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/GeomBuffer.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
-
-import javax.media.j3d.Geometry;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Point3f;
-import javax.vecmath.TexCoord2f;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.geometry;
+
+import org.jogamp.java3d.Geometry;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleFanArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.TexCoord2f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * GeomBuffer allows OpenGL-like input of geometry data. It outputs
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java b/src/classes/share/org/jogamp/java3d/utils/geometry/GeometryInfo.java
index d012176..4bff8e9 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/GeometryInfo.java
@@ -37,40 +37,40 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.util.HashMap;
 
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.IndexedQuadArray;
-import javax.media.j3d.IndexedTriangleArray;
-import javax.media.j3d.IndexedTriangleFanArray;
-import javax.media.j3d.IndexedTriangleStripArray;
-import javax.media.j3d.J3DBuffer;
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Color3b;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4b;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point2f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.TexCoord2f;
-import javax.vecmath.TexCoord3f;
-import javax.vecmath.TexCoord4f;
-import javax.vecmath.Tuple2f;
-import javax.vecmath.Tuple3f;
-import javax.vecmath.Tuple4f;
-import javax.vecmath.Vector3f;
-
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.IndexedQuadArray;
+import org.jogamp.java3d.IndexedTriangleArray;
+import org.jogamp.java3d.IndexedTriangleFanArray;
+import org.jogamp.java3d.IndexedTriangleStripArray;
+import org.jogamp.java3d.J3DBuffer;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleFanArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Color3b;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4b;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point2f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.TexCoord2f;
+import org.jogamp.vecmath.TexCoord3f;
+import org.jogamp.vecmath.TexCoord4f;
+import org.jogamp.vecmath.Tuple2f;
+import org.jogamp.vecmath.Tuple3f;
+import org.jogamp.vecmath.Tuple4f;
+import org.jogamp.vecmath.Vector3f;
+
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * The GeometryInfo object holds data for processing by the Java3D geometry
@@ -134,9 +134,9 @@ import com.sun.j3d.internal.J3dUtilsI18N;
  *
  * @see NormalGenerator
  * @see Stripifier
- * @see com.sun.j3d.utils.compression.CompressionStream
- * @see com.sun.j3d.utils.compression.GeometryCompressor
- * @see javax.media.j3d.GeometryArray
+ * @see org.jogamp.java3d.utils.compression.CompressionStream
+ * @see org.jogamp.java3d.utils.compression.GeometryCompressor
+ * @see org.jogamp.java3d.GeometryArray
  */
 
 public class GeometryInfo {
@@ -1803,19 +1803,19 @@ public class GeometryInfo {
    */
   Object[] allocateArray(Object data[], int num) {
       Object newData[] = null;
-      if (data instanceof javax.vecmath.Point3f[]) {
+      if (data instanceof org.jogamp.vecmath.Point3f[]) {
 	  newData = new Point3f[num];
-      } else if (data instanceof javax.vecmath.Vector3f[]) {
+      } else if (data instanceof org.jogamp.vecmath.Vector3f[]) {
 	  newData = new Vector3f[num];
-      } else if (data instanceof javax.vecmath.Color3f[]) {
+      } else if (data instanceof org.jogamp.vecmath.Color3f[]) {
 	  newData = new Color3f[num];
-      } else if (data instanceof javax.vecmath.Color4f[]) {
+      } else if (data instanceof org.jogamp.vecmath.Color4f[]) {
 	  newData = new Color4f[num];
-      } else if (data instanceof javax.vecmath.TexCoord2f[]) {
+      } else if (data instanceof org.jogamp.vecmath.TexCoord2f[]) {
 	  newData = new TexCoord2f[num];
-      } else if (data instanceof javax.vecmath.TexCoord3f[]) {
+      } else if (data instanceof org.jogamp.vecmath.TexCoord3f[]) {
 	  newData = new TexCoord3f[num];
-      } else if (data instanceof javax.vecmath.TexCoord4f[]) {
+      } else if (data instanceof org.jogamp.vecmath.TexCoord4f[]) {
 	  newData = new TexCoord4f[num];
       } else if (data instanceof IndexRow[]) {
 	  // Hack so we can use compactData for coordIndexOnly
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java b/src/classes/share/org/jogamp/java3d/utils/geometry/GeometryInfoGenerator.java
index e0178b7..7a9100e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/GeometryInfoGenerator.java
@@ -37,38 +37,38 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.IndexedGeometryStripArray;
-import javax.media.j3d.IndexedQuadArray;
-import javax.media.j3d.IndexedTriangleArray;
-import javax.media.j3d.IndexedTriangleFanArray;
-import javax.media.j3d.IndexedTriangleStripArray;
-import javax.media.j3d.J3DBuffer;
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Color3b;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4b;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.TexCoord2f;
-import javax.vecmath.TexCoord3f;
-import javax.vecmath.TexCoord4f;
-import javax.vecmath.Vector3f;
-
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.GeometryStripArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.IndexedGeometryStripArray;
+import org.jogamp.java3d.IndexedQuadArray;
+import org.jogamp.java3d.IndexedTriangleArray;
+import org.jogamp.java3d.IndexedTriangleFanArray;
+import org.jogamp.java3d.IndexedTriangleStripArray;
+import org.jogamp.java3d.J3DBuffer;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleFanArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Color3b;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4b;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.TexCoord2f;
+import org.jogamp.vecmath.TexCoord3f;
+import org.jogamp.vecmath.TexCoord4f;
+import org.jogamp.vecmath.Vector3f;
+
+import org.jogamp.java3d.internal.BufferWrapper;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java b/src/classes/share/org/jogamp/java3d/utils/geometry/GeometryServiceImpl.java
index f3b0dff..d80a607 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryServiceImpl.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/GeometryServiceImpl.java
@@ -1,11 +1,11 @@
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.util.ArrayList;
 
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.GeometryService;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.GeometryService;
+import org.jogamp.vecmath.Point3f;
 
 /**
  * Default implementation of the {@link GeometryService} service interface.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Heap.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Heap.java
index a0e23f2..6c23656 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Heap.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Heap.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class Heap {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/HeapNode.java b/src/classes/share/org/jogamp/java3d/utils/geometry/HeapNode.java
index 12f369b..63c19b7 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/HeapNode.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/HeapNode.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 class HeapNode {
     int index, prev, next;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Left.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Left.java
index dd6edc4..3fe6343 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Left.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Left.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 class Left extends Object {
     int ind;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/ListNode.java b/src/classes/share/org/jogamp/java3d/utils/geometry/ListNode.java
index 089d664..0896e56 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/ListNode.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/ListNode.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 class ListNode {
     int index;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java b/src/classes/share/org/jogamp/java3d/utils/geometry/NoHash.java
index 7286506..462d86b 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/NoHash.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class NoHash {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java b/src/classes/share/org/jogamp/java3d/utils/geometry/NormalGenerator.java
index 5168a89..8d53ab4 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/NormalGenerator.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.util.ArrayList;
 
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * The NormalGenerator utility will calculate and fill in the normals
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Numerics.java
index 1348180..6ec8432 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Numerics.java
@@ -52,10 +52,10 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.vecmath.Point2f;
-import javax.vecmath.Tuple2f;
+import org.jogamp.vecmath.Point2f;
+import org.jogamp.vecmath.Tuple2f;
 
 class Numerics {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Orientation.java
index c8ae26d..d532a81 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Orientation.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class Orientation {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/PntNode.java b/src/classes/share/org/jogamp/java3d/utils/geometry/PntNode.java
index a2b0252..cadd841 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/PntNode.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/PntNode.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 // Placeholder list
 class PntNode extends Object {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Primitive.java
index 6080b3a..486a0a0 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Primitive.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.util.Hashtable;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Group;
-import javax.media.j3d.Material;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.vecmath.Color3f;
 
 /**
  * Base class for all Java 3D primitives. By default all primitives
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Project.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Project.java
index 7bd92cc..1e39b7f 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Project.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Project.java
@@ -52,12 +52,12 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.vecmath.Matrix4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Tuple3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Matrix4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Tuple3f;
+import org.jogamp.vecmath.Vector3f;
 
 class Project  {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Quadrics.java
index bfaaac0..18db75d 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Quadrics.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 
 class Quadrics extends Object {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Simple.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Simple.java
index a3605be..92020a9 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Simple.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Simple.java
@@ -52,9 +52,9 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
-import javax.vecmath.Point3f;
+import org.jogamp.vecmath.Point3f;
 
 
 class Simple {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Sphere.java
index 98f56ec..23bdf89 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Sphere.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
-
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Point3f;
-import javax.vecmath.TexCoord2f;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.geometry;
+
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.NodeComponent;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.TexCoord2f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * Sphere is a geometry primitive created with a given radius and resolution.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Stripifier.java
index e6f34a2..f6353e1 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Stripifier.java
@@ -52,11 +52,11 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.util.ArrayList;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * The Stripifier utility will change the primitive of the GeometryInfo
@@ -2037,14 +2037,14 @@ public class Stripifier {
 	    int[] normals = null;
 	    int[][] textures = null;
 	    int[] colors = null;
-	    javax.vecmath.Color3b[] stripColors = null;
+	    org.jogamp.vecmath.Color3b[] stripColors = null;
 	    if (hasNormals) normals = new int[ciSize];
 	    if (hasTextures) {
 		textures = new int[texSetCount][ciSize];
 	    }
 	    if (hasColors) colors = new int[ciSize];
 	    if (colorStrips) {
-		stripColors = new javax.vecmath.Color3b[ciSize];
+		stripColors = new org.jogamp.vecmath.Color3b[ciSize];
 		colors = new int[ciSize];
 	    }
 	    int count = 0;
@@ -2076,7 +2076,7 @@ public class Stripifier {
 		    }
 		    if (hasColors) colors[count] = currStrip.istream[j].color;
 		    if (colorStrips) stripColors[count] =
-					 new javax.vecmath.Color3b(stripColor);
+					 new org.jogamp.vecmath.Color3b(stripColor);
 		    count++;
 		}
 	    }
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/StripifierStats.java b/src/classes/share/org/jogamp/java3d/utils/geometry/StripifierStats.java
index 5431473..f5d1e68 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/StripifierStats.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/StripifierStats.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.util.ArrayList;
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Text2D.java
index 77bb632..e9c8e59 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Text2D.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -48,18 +48,18 @@ import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 import java.util.Hashtable;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.ImageComponent;
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.Material;
-import javax.media.j3d.Node;
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Texture;
-import javax.media.j3d.Texture2D;
-import javax.media.j3d.TransparencyAttributes;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.ImageComponent;
+import org.jogamp.java3d.ImageComponent2D;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.Texture2D;
+import org.jogamp.java3d.TransparencyAttributes;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
 
 /**
  * A Text2D object is a representation of a string as a texture mapped
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Triangle.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Triangle.java
index a27ea4b..7cd5ad4 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Triangle.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Triangle.java
@@ -52,7 +52,7 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 class Triangle extends Object {
     int v1, v2, v3; // This store the index into the list array.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java b/src/classes/share/org/jogamp/java3d/utils/geometry/Triangulator.java
index ca4801c..85ece04 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/Triangulator.java
@@ -52,15 +52,15 @@
 //
 // ----------------------------------------------------------------------
 
-package com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.geometry;
 
 import java.util.Random;
 
-import javax.vecmath.Point2f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Point2f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * Triangulator is a utility for turning arbitrary polygons into triangles
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CommandStream.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CommandStream.java
index 576fbc4..854af06 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CommandStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CommandStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 /**
  * This class is used to build the bit-level compression command stream which
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressedGeometryData.java
index 4c18434..1e0fa09 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressedGeometryData.java
@@ -37,14 +37,14 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.J3DBuffer;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.J3DBuffer;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.vecmath.Point3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * The compressed geometry object is used to store geometry in a
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressedGeometryFile.java
index 797c9fc..9b27ae3 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressedGeometryFile.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import javax.media.j3d.CapabilityNotSetException;
+import org.jogamp.java3d.CapabilityNotSetException;
 
 //
 // The compressed geometry file format supported by this class has a 32
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressedGeometryRetained.java
index 5a3b333..bda1df5 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressedGeometryRetained.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import javax.media.j3d.GeometryArray;
+import org.jogamp.java3d.GeometryArray;
 
 /**
  * The compressed geometry object is used to store geometry in a
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStream.java
index f501db9..5000b33 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
@@ -46,36 +46,36 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Geometry;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.IndexedGeometryStripArray;
-import javax.media.j3d.IndexedLineArray;
-import javax.media.j3d.IndexedLineStripArray;
-import javax.media.j3d.IndexedQuadArray;
-import javax.media.j3d.IndexedTriangleArray;
-import javax.media.j3d.IndexedTriangleFanArray;
-import javax.media.j3d.IndexedTriangleStripArray;
-import javax.media.j3d.J3DBuffer;
-import javax.media.j3d.LineArray;
-import javax.media.j3d.LineStripArray;
-import javax.media.j3d.Material;
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Point3i;
-import javax.vecmath.Vector3f;
-
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.utils.geometry.GeometryInfo;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Geometry;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.GeometryStripArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.IndexedGeometryStripArray;
+import org.jogamp.java3d.IndexedLineArray;
+import org.jogamp.java3d.IndexedLineStripArray;
+import org.jogamp.java3d.IndexedQuadArray;
+import org.jogamp.java3d.IndexedTriangleArray;
+import org.jogamp.java3d.IndexedTriangleFanArray;
+import org.jogamp.java3d.IndexedTriangleStripArray;
+import org.jogamp.java3d.J3DBuffer;
+import org.jogamp.java3d.LineArray;
+import org.jogamp.java3d.LineStripArray;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleFanArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Point3i;
+import org.jogamp.vecmath.Vector3f;
+
+import org.jogamp.java3d.internal.BufferWrapper;
+import org.jogamp.java3d.utils.geometry.GeometryInfo;
 
 /**
  * This class is used as input to a geometry compressor.  It collects elements
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamColor.java
index 674eb96..bcdf5c9 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamColor.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamColor.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
 
 /**
  * This class represents a color in a compression stream. It maintains both
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamElement.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamElement.java
index 2e8fe98..9f8914e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamElement.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamElement.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 /**
  * Instances of this class are used as elements in a CompressionStream.
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamNormal.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamNormal.java
index b43939a..b34e27d 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStreamNormal.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamNormal.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * This class represents a normal in a compression stream. It maintains both
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamVertex.java
index fb52482..5a66626 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStreamVertex.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/CompressionStreamVertex.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * This class represents a vertex in a compression stream.  It maintains both
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStrip.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeneralizedStrip.java
index 029fd0b..4e62bb3 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStrip.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeneralizedStrip.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStripFlags.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeneralizedStripFlags.java
index 9fd75ea..af4e1a7 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedStripFlags.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeneralizedStripFlags.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 /**
  * A class which implements GeneralizedStripFlags provides the means to access
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeneralizedVertexList.java
index b5832af..5bd896b 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeneralizedVertexList.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 import java.util.ArrayList;
 
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.LineStripArray;
-import javax.media.j3d.PointArray;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.GeometryStripArray;
+import org.jogamp.java3d.LineStripArray;
+import org.jogamp.java3d.PointArray;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleFanArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * The GeneralizedVertexList class is a variable-size list used to
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeometryCompressor.java
index c64a691..74bf39e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeometryCompressor.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 import java.io.IOException;
 
-import javax.vecmath.Point3d;
+import org.jogamp.vecmath.Point3d;
 
 /**
  * A GeometryCompressor takes a stream of geometric elements and
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeometryDecompressor.java
index bbbaa94..22b6449 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeometryDecompressor.java
@@ -37,14 +37,14 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import javax.media.j3d.CompressedGeometryHeader;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.CompressedGeometryHeader;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * This abstract class provides the base methods needed to create a geometry
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeometryDecompressorShape3D.java
index b412f9f..56fc372 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/GeometryDecompressorShape3D.java
@@ -37,25 +37,25 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 import java.util.ArrayList;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.CompressedGeometry;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.LineStripArray;
-import javax.media.j3d.Material;
-import javax.media.j3d.PointArray;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
-
-import com.sun.j3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.CompressedGeometry;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.GeometryStripArray;
+import org.jogamp.java3d.LineStripArray;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.PointArray;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
+
+import org.jogamp.java3d.internal.J3dUtilsI18N;
 
 /**
  * This class implements a Shape3D backend for the abstract
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanNode.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/HuffmanNode.java
index b0f16b5..6ae24ff 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanNode.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/HuffmanNode.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 import java.util.Collection;
 import java.util.Comparator;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanTable.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/HuffmanTable.java
index f874e5a..cb88872 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/HuffmanTable.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/HuffmanTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/MeshBuffer.java
index 0c2ab94..ecfd53f 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/MeshBuffer.java
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/MeshBuffer.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.geometry.compression;
+package org.jogamp.java3d.utils.geometry.compression;
 
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * This class mirrors the vertex mesh buffer stack supported by the geometry
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/package.html b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/package.html
index 2977b07..948d235 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/compression/package.html
@@ -3,11 +3,11 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.geometry.compression</title>
+  <title>org.jogamp.java3d.utils.geometry.compression</title>
 </head>
 <body>
 <p>Provides compressed geometry utility classes.
-  This package supersedes the javax.media.j3d.CompressedGeometry class and
-  the com.sun.j3d.utils.compression package.</p>
+  This package supersedes the org.jogamp.java3d.CompressedGeometry class and
+  the org.jogamp.java3d.utils.compression package.</p>
 </body>
 </html>
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/package.html b/src/classes/share/org/jogamp/java3d/utils/geometry/package.html
index 49da2ca..271424e 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/geometry/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.geometry</title>
+  <title>org.jogamp.java3d.utils.geometry</title>
 </head>
 <body>
 <p>Provides geometry construction, triangulation, and optimization
diff --git a/src/classes/share/com/sun/j3d/utils/image/ImageException.java b/src/classes/share/org/jogamp/java3d/utils/image/ImageException.java
index fef584a..c2824ca 100644
--- a/src/classes/share/com/sun/j3d/utils/image/ImageException.java
+++ b/src/classes/share/org/jogamp/java3d/utils/image/ImageException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.image;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java b/src/classes/share/org/jogamp/java3d/utils/image/TextureLoader.java
index 09fd841..182126d 100644
--- a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java
+++ b/src/classes/share/org/jogamp/java3d/utils/image/TextureLoader.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.image;
 
 import java.awt.Component;
 import java.awt.Image;
@@ -58,11 +58,11 @@ import java.io.IOException;
 import java.net.URL;
 
 import javax.imageio.ImageIO;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.ImageComponent;
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.Texture;
-import javax.media.j3d.Texture2D;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.ImageComponent;
+import org.jogamp.java3d.ImageComponent2D;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.Texture2D;
 
 /**
  * This class is used for loading a texture from an Image or BufferedImage.
diff --git a/src/classes/share/com/sun/j3d/utils/image/package.html b/src/classes/share/org/jogamp/java3d/utils/image/package.html
index e32c5d8..27b3560 100644
--- a/src/classes/share/com/sun/j3d/utils/image/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/image/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.image</title>
+  <title>org.jogamp.java3d.utils.image</title>
 </head>
 <body>
 <p>Provides texture image utility classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/PickCanvas.java
index 2172df3..4f58c06 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/PickCanvas.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast;
+package org.jogamp.java3d.utils.pickfast;
 
 import java.awt.event.MouseEvent;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Locale;
-import javax.media.j3d.PickConeRay;
-import javax.media.j3d.PickCylinderRay;
-import javax.media.j3d.PickRay;
-import javax.media.j3d.PickShape;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.PickConeRay;
+import org.jogamp.java3d.PickCylinderRay;
+import org.jogamp.java3d.PickRay;
+import org.jogamp.java3d.PickShape;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * A subclass of PickTool, simplifies picking using mouse events from a canvas.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/PickIntersection.java
index 0020956..d082095 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/PickIntersection.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast;
-
-import javax.media.j3d.Geometry;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.PickInfo;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3d;
-import javax.vecmath.TexCoord3f;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.pickfast;
+
+import org.jogamp.java3d.Geometry;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.PickInfo;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.TexCoord3f;
+import org.jogamp.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * Holds information about an intersection of a PickShape with a Node
@@ -60,7 +60,7 @@ import javax.vecmath.Vector3f;
  * The intersected primitive indicates which primitive out of the GeometryArray
  * was intersected (where the primitive is a point, line, triangle or quad,
  * not a
- * <code>com.sun.j3d.utils.geometry.Primitive)</code>.
+ * <code>org.jogamp.java3d.utils.geometry.Primitive)</code>.
  * For example, the intersection would indicate which triangle out of a
  * triangle strip was intersected.
  * The methods which return primitive data will have one value if the primitive
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/PickTool.java
index 1a9d91a..430d143 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/PickTool.java
@@ -37,32 +37,32 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Group;
-import javax.media.j3d.Link;
-import javax.media.j3d.Locale;
-import javax.media.j3d.Morph;
-import javax.media.j3d.Node;
-import javax.media.j3d.PickBounds;
-import javax.media.j3d.PickConeRay;
-import javax.media.j3d.PickConeSegment;
-import javax.media.j3d.PickCylinderRay;
-import javax.media.j3d.PickCylinderSegment;
-import javax.media.j3d.PickInfo;
-import javax.media.j3d.PickRay;
-import javax.media.j3d.PickSegment;
-import javax.media.j3d.PickShape;
-import javax.media.j3d.SceneGraphPath;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Switch;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
-
-import com.sun.j3d.utils.geometry.Primitive;
+package org.jogamp.java3d.utils.pickfast;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Link;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.Morph;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.PickBounds;
+import org.jogamp.java3d.PickConeRay;
+import org.jogamp.java3d.PickConeSegment;
+import org.jogamp.java3d.PickCylinderRay;
+import org.jogamp.java3d.PickCylinderSegment;
+import org.jogamp.java3d.PickInfo;
+import org.jogamp.java3d.PickRay;
+import org.jogamp.java3d.PickSegment;
+import org.jogamp.java3d.PickShape;
+import org.jogamp.java3d.SceneGraphPath;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Switch;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
+
+import org.jogamp.java3d.utils.geometry.Primitive;
 
 /**
  * The base class for optimized picking operations.
@@ -99,7 +99,7 @@ import com.sun.j3d.utils.geometry.Primitive;
  * will be sorted by the distance from the start point of the pick shape to
  * the intersection point.
  *
- * @see Locale#pickClosest(int,int,javax.media.j3d.PickShape)
+ * @see Locale#pickClosest(int,int,org.jogamp.java3d.PickShape)
  */
 public class PickTool {
 
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickMouseBehavior.java
index 4cfdaa8..3b1862f 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickMouseBehavior.java
@@ -37,24 +37,24 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
+package org.jogamp.java3d.utils.pickfast.behaviors;
 
 import java.awt.AWTEvent;
 import java.awt.Event;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOr;
-
-import com.sun.j3d.utils.pickfast.PickCanvas;
-import com.sun.j3d.utils.pickfast.PickTool;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOr;
+
+import org.jogamp.java3d.utils.pickfast.PickCanvas;
+import org.jogamp.java3d.utils.pickfast.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickRotateBehavior.java
index 62ad8e4..3913175 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickRotateBehavior.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.PickInfo;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
-import com.sun.j3d.utils.pickfast.PickTool;
+package org.jogamp.java3d.utils.pickfast.behaviors;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.PickInfo;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseRotate;
+import org.jogamp.java3d.utils.pickfast.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and rotate scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickTranslateBehavior.java
index 23037b2..b885192 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickTranslateBehavior.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.PickInfo;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
-import com.sun.j3d.utils.pickfast.PickTool;
+package org.jogamp.java3d.utils.pickfast.behaviors;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.PickInfo;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseTranslate;
+import org.jogamp.java3d.utils.pickfast.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and translate scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickZoomBehavior.java
index a954aab..04faacc 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickZoomBehavior.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.PickInfo;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
-import com.sun.j3d.utils.pickfast.PickTool;
+package org.jogamp.java3d.utils.pickfast.behaviors;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.PickInfo;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseZoom;
+import org.jogamp.java3d.utils.pickfast.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickingCallback.java
index 98573e9..0a967d3 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickingCallback.java
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/PickingCallback.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.pickfast.behaviors;
+package org.jogamp.java3d.utils.pickfast.behaviors;
 
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.TransformGroup;
 
 /**
  * The PickingCallback interface allows a class to be notified when a
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/package.html b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/package.html
index c401786..e814f82 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/behaviors/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.pickfast.behaviors</title>
+  <title>org.jogamp.java3d.utils.pickfast.behaviors</title>
 </head>
 <body>
 <p>Provides picking behaviors for the new core picking methods.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/package.html b/src/classes/share/org/jogamp/java3d/utils/pickfast/package.html
index b23eb91..044927f 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/pickfast/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.pickfast</title>
+  <title>org.jogamp.java3d.utils.pickfast</title>
 </head>
 <body>
 <p>Provides picking utility classes for the new core picking methods.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java b/src/classes/share/org/jogamp/java3d/utils/picking/PickCanvas.java
index 774b916..1af4e6c 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/PickCanvas.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
+package org.jogamp.java3d.utils.picking;
 
 import java.awt.event.MouseEvent;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Locale;
-import javax.media.j3d.PickConeRay;
-import javax.media.j3d.PickCylinderRay;
-import javax.media.j3d.PickRay;
-import javax.media.j3d.PickShape;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.PickConeRay;
+import org.jogamp.java3d.PickCylinderRay;
+import org.jogamp.java3d.PickRay;
+import org.jogamp.java3d.PickShape;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * A subclass of PickTool, simplifies picking using mouse events from a canvas.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java b/src/classes/share/org/jogamp/java3d/utils/picking/PickIntersection.java
index df88c89..2e7c070 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/PickIntersection.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
-
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.vecmath.Color3b;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4b;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.TexCoord2f;
-import javax.vecmath.TexCoord3f;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Vector3f;
+package org.jogamp.java3d.utils.picking;
+
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.vecmath.Color3b;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4b;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.TexCoord2f;
+import org.jogamp.vecmath.TexCoord3f;
+import org.jogamp.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3f;
 
 /**
  * Holds information about an intersection of a PickShape with a Node
@@ -65,7 +65,7 @@ import javax.vecmath.Vector3f;
  * The intersected primitive indicates which primitive out of the GeometryArray
  * was intersected (where the primitive is a point, line, triangle or quad,
  * not a
- * <code>com.sun.j3d.utils.geometry.Primitive)</code>.
+ * <code>org.jogamp.java3d.utils.geometry.Primitive)</code>.
  * For example, the intersection would indicate which triangle out of a
  * triangle strip was intersected.
  * The methods which return primitive data will have one value if the primitive
@@ -108,7 +108,7 @@ import javax.vecmath.Vector3f;
  * can be inquired
  * the geometry includes them and the corresponding READ capibility bits are
  * set.
- * <A HREF="PickTool.html#setCapabilities(javax.media.j3d.Node, int)">
+ * <A HREF="PickTool.html#setCapabilities(org.jogamp.java3d.Node, int)">
  * <code>PickTool.setCapabilties(Node, int)</code></A>
  * can be used to set the capability bits
  * to allow this data to be inquired.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickResult.java b/src/classes/share/org/jogamp/java3d/utils/picking/PickResult.java
index be7f290..b385ba0 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickResult.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/PickResult.java
@@ -37,63 +37,63 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
+package org.jogamp.java3d.utils.picking;
 
 import java.util.ArrayList;
 
-import javax.media.j3d.BoundingBox;
-import javax.media.j3d.BoundingPolytope;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.CompressedGeometry;
-import javax.media.j3d.Geometry;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.Group;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.IndexedLineArray;
-import javax.media.j3d.IndexedLineStripArray;
-import javax.media.j3d.IndexedPointArray;
-import javax.media.j3d.IndexedQuadArray;
-import javax.media.j3d.IndexedTriangleArray;
-import javax.media.j3d.IndexedTriangleFanArray;
-import javax.media.j3d.IndexedTriangleStripArray;
-import javax.media.j3d.LineArray;
-import javax.media.j3d.LineStripArray;
-import javax.media.j3d.Link;
-import javax.media.j3d.Morph;
-import javax.media.j3d.Node;
-import javax.media.j3d.PickBounds;
-import javax.media.j3d.PickCone;
-import javax.media.j3d.PickConeRay;
-import javax.media.j3d.PickConeSegment;
-import javax.media.j3d.PickCylinder;
-import javax.media.j3d.PickCylinderRay;
-import javax.media.j3d.PickCylinderSegment;
-import javax.media.j3d.PickPoint;
-import javax.media.j3d.PickRay;
-import javax.media.j3d.PickSegment;
-import javax.media.j3d.PickShape;
-import javax.media.j3d.PointArray;
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.SceneGraphPath;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Switch;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.vecmath.Point2d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Point4d;
-import javax.vecmath.Tuple3d;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Vector4d;
-
-import com.sun.j3d.internal.Distance;
-import com.sun.j3d.utils.geometry.Primitive;
+import org.jogamp.java3d.BoundingBox;
+import org.jogamp.java3d.BoundingPolytope;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.CompressedGeometry;
+import org.jogamp.java3d.Geometry;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.IndexedLineArray;
+import org.jogamp.java3d.IndexedLineStripArray;
+import org.jogamp.java3d.IndexedPointArray;
+import org.jogamp.java3d.IndexedQuadArray;
+import org.jogamp.java3d.IndexedTriangleArray;
+import org.jogamp.java3d.IndexedTriangleFanArray;
+import org.jogamp.java3d.IndexedTriangleStripArray;
+import org.jogamp.java3d.LineArray;
+import org.jogamp.java3d.LineStripArray;
+import org.jogamp.java3d.Link;
+import org.jogamp.java3d.Morph;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.PickBounds;
+import org.jogamp.java3d.PickCone;
+import org.jogamp.java3d.PickConeRay;
+import org.jogamp.java3d.PickConeSegment;
+import org.jogamp.java3d.PickCylinder;
+import org.jogamp.java3d.PickCylinderRay;
+import org.jogamp.java3d.PickCylinderSegment;
+import org.jogamp.java3d.PickPoint;
+import org.jogamp.java3d.PickRay;
+import org.jogamp.java3d.PickSegment;
+import org.jogamp.java3d.PickShape;
+import org.jogamp.java3d.PointArray;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.SceneGraphPath;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Switch;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.TriangleArray;
+import org.jogamp.java3d.TriangleFanArray;
+import org.jogamp.java3d.TriangleStripArray;
+import org.jogamp.vecmath.Point2d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Point4d;
+import org.jogamp.vecmath.Tuple3d;
+import org.jogamp.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector4d;
+
+import org.jogamp.java3d.internal.Distance;
+import org.jogamp.java3d.utils.geometry.Primitive;
 
 /**
  * Stores information about a pick hit.
@@ -102,7 +102,7 @@ import com.sun.j3d.utils.geometry.Primitive;
  * basic information and more detailed information is generated as needed.  The
  * additional information is only available if capability bits on the scene
  * graph Nodes are set properly;
- * <A HREF="PickTool.html#setCapabilities(javax.media.j3d.Node, int)">
+ * <A HREF="PickTool.html#setCapabilities(org.jogamp.java3d.Node, int)">
  * <code>PickTool.setCapabilties(Node, int)</code></A>
  * can
  * be used to ensure correct capabilites are set. Inquiring data which is not
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickTool.java b/src/classes/share/org/jogamp/java3d/utils/picking/PickTool.java
index b3e940b..50c6e05 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickTool.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/PickTool.java
@@ -37,29 +37,29 @@
  *
  */
 
-package com.sun.j3d.utils.picking;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.CompressedGeometry;
-import javax.media.j3d.Geometry;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.Locale;
-import javax.media.j3d.Morph;
-import javax.media.j3d.Node;
-import javax.media.j3d.PickBounds;
-import javax.media.j3d.PickConeRay;
-import javax.media.j3d.PickConeSegment;
-import javax.media.j3d.PickCylinderRay;
-import javax.media.j3d.PickCylinderSegment;
-import javax.media.j3d.PickRay;
-import javax.media.j3d.PickSegment;
-import javax.media.j3d.PickShape;
-import javax.media.j3d.SceneGraphPath;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
+package org.jogamp.java3d.utils.picking;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.CompressedGeometry;
+import org.jogamp.java3d.Geometry;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.Morph;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.PickBounds;
+import org.jogamp.java3d.PickConeRay;
+import org.jogamp.java3d.PickConeSegment;
+import org.jogamp.java3d.PickCylinderRay;
+import org.jogamp.java3d.PickCylinderSegment;
+import org.jogamp.java3d.PickRay;
+import org.jogamp.java3d.PickSegment;
+import org.jogamp.java3d.PickShape;
+import org.jogamp.java3d.SceneGraphPath;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * The base class for picking operations.
@@ -96,7 +96,7 @@ import javax.vecmath.Vector3d;
  * </LI>
  * </UL>
  * <p> The utility method
- * <A HREF="PickTool.html#setCapabilities(javax.media.j3d.Node, int)">
+ * <A HREF="PickTool.html#setCapabilities(org.jogamp.java3d.Node, int)">
  * <code>PickTool.setCapabilities(Node, int)</code></A>
  * can be used before the scene graph is
  * made live to set the
@@ -242,7 +242,7 @@ public class PickTool {
      * Sets the capabilities on the Node and it's components to allow
      * picking at the specified detail level.
      * <p>
-     * Note that by default all com.sun.j3d.utils.geometry.Primitive
+     * Note that by default all org.jogamp.java3d.utils.geometry.Primitive
      * objects with the same parameters share their geometry (e.g.,
      * you can have 50 spheres in your scene, but the geometry is
      * stored only once).  Therefore the capabilities of the geometry
@@ -257,7 +257,7 @@ public class PickTool {
      *  INTERSECT_COORD or INTERSECT_FULL
      * @throws IllegalArgumentException if Node is not a Shape3D or Morph or
      *	if the flag value is not valid.
-     * @throws javax.media.j3d.RestrictedAccessException if the node is part
+     * @throws org.jogamp.java3d.RestrictedAccessException if the node is part
      *  of a live or compiled scene graph.  */
     static public void setCapabilities(Node node, int level)  {
 	if (node instanceof Morph) {
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickMouseBehavior.java
index 7aecb25..ce41f53 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickMouseBehavior.java
@@ -37,24 +37,24 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
+package org.jogamp.java3d.utils.picking.behaviors;
 
 import java.awt.AWTEvent;
 import java.awt.Event;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupOnAWTEvent;
-import javax.media.j3d.WakeupOr;
-
-import com.sun.j3d.utils.picking.PickCanvas;
-import com.sun.j3d.utils.picking.PickTool;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.WakeupCriterion;
+import org.jogamp.java3d.WakeupOnAWTEvent;
+import org.jogamp.java3d.WakeupOr;
+
+import org.jogamp.java3d.utils.picking.PickCanvas;
+import org.jogamp.java3d.utils.picking.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickRotateBehavior.java
index f28d436..712ca7b 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickRotateBehavior.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
-import com.sun.j3d.utils.picking.PickResult;
-import com.sun.j3d.utils.picking.PickTool;
+package org.jogamp.java3d.utils.picking.behaviors;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseRotate;
+import org.jogamp.java3d.utils.picking.PickResult;
+import org.jogamp.java3d.utils.picking.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and drag scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickTranslateBehavior.java
index 0768579..0d8c544 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickTranslateBehavior.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
-import com.sun.j3d.utils.picking.PickResult;
-import com.sun.j3d.utils.picking.PickTool;
+package org.jogamp.java3d.utils.picking.behaviors;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseTranslate;
+import org.jogamp.java3d.utils.picking.PickResult;
+import org.jogamp.java3d.utils.picking.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and translate scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickZoomBehavior.java
index 9276560..f50ad05 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickZoomBehavior.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
-
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
-import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
-import com.sun.j3d.utils.picking.PickResult;
-import com.sun.j3d.utils.picking.PickTool;
+package org.jogamp.java3d.utils.picking.behaviors;
+
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseZoom;
+import org.jogamp.java3d.utils.picking.PickResult;
+import org.jogamp.java3d.utils.picking.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickingCallback.java
index 5678bd0..7663b37 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickingCallback.java
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/PickingCallback.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.picking.behaviors;
+package org.jogamp.java3d.utils.picking.behaviors;
 
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.TransformGroup;
 
 /**
  * The PickingCallback interface allows a class to be notified when a
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/package.html b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/package.html
index 21ef9e7..32ba40f 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/behaviors/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.picking.behaviors</title>
+  <title>org.jogamp.java3d.utils.picking.behaviors</title>
 </head>
 <body>
 <p><i>OBSOLETE</i>: provides picking behaviors for the old picking
diff --git a/src/classes/share/com/sun/j3d/utils/picking/package.html b/src/classes/share/org/jogamp/java3d/utils/picking/package.html
index 1b9d21b..1571e03 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/picking/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.picking</title>
+  <title>org.jogamp.java3d.utils.picking</title>
 </head>
 <body>
 <p><i>OBSOLETE</i>: provides picking utility classes for the old
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/NamedObjectException.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/NamedObjectException.java
index bea6d1e..e1da7b7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/NamedObjectException.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/NamedObjectException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 /**
  * An error has occurred while processing a named object
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/ObjectNotLoadedException.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/ObjectNotLoadedException.java
index 6fb363a..073ee01 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/ObjectNotLoadedException.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/ObjectNotLoadedException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 /**
  * The named object has not been loaded so it's instance can not be returned
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphFileReader.java
index b389e12..853257e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphFileReader.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 import java.io.IOException;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import org.jogamp.java3d.utils.scenegraph.io.retained.RandomAccessFileControl;
+import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
 
 /**
  * Read Java3D BranchGraphs and/or Universe from a file. Individual branchgraphs or an
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphFileWriter.java
index 7931429..836b07e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphFileWriter.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 import java.io.File;
 import java.io.IOException;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl;
-import com.sun.j3d.utils.universe.SimpleUniverse;
+import org.jogamp.java3d.utils.scenegraph.io.retained.RandomAccessFileControl;
+import org.jogamp.java3d.utils.universe.SimpleUniverse;
 
 /**
  * Write a (set) of Java3D BranchGraphs and/or Universe to a file. The BranchGraphs
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphIO.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphIO.java
index 58dee3d..683e057 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphIO.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphIO.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 /**
  * Implement this interface in any classes that subclass a Java3D SceneGraphObject
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
index 6002ecf..ed60374 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphObjectReferenceControl.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 /**
  * Provides and resolves references to SceneGraphObjects to enable
@@ -52,13 +52,13 @@ public interface SceneGraphObjectReferenceControl {
      *
      * Use only during the save cycle
      */
-    public int addReference( javax.media.j3d.SceneGraphObject object );
+    public int addReference( org.jogamp.java3d.SceneGraphObject object );
 
     /**
      * Given a nodeID return the corresponding scene graph object.
      *
      * Use only during the load cycle
      */
-    public javax.media.j3d.SceneGraphObject resolveReference( int nodeID );
+    public org.jogamp.java3d.SceneGraphObject resolveReference( int nodeID );
 }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStateProvider.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
index 77daed3..070fad6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStateProvider.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
 /**
  * This interface allows developers to provide their own custom IO control for
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStreamReader.java
index 2faee62..60bacac 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStreamReader.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.StreamControl;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import org.jogamp.java3d.utils.scenegraph.io.retained.StreamControl;
+import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
 
 /**
  * Read and create a (set) of Java3D BranchGraphs or Universe from a Java Stream.
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStreamWriter.java
index 3f6564c..103a44d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStreamWriter.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.DanglingReferenceException;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.DanglingReferenceException;
 
-import com.sun.j3d.utils.scenegraph.io.retained.StreamControl;
-import com.sun.j3d.utils.universe.SimpleUniverse;
+import org.jogamp.java3d.utils.scenegraph.io.retained.StreamControl;
+import org.jogamp.java3d.utils.universe.SimpleUniverse;
 
 /**
  * Writes a Java3D SceneGraph to a Java OutputStream.<p>
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/UnresolvedBehavior.java
index 1ad2553..78f8f82 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnresolvedBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/UnresolvedBehavior.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 /**
  * This Behavior is used in place of any behaviors which can not
@@ -47,7 +47,7 @@ package com.sun.j3d.utils.scenegraph.io;
  *
  * This normally means the Behavior is not present in the classpath.
  */
-public class UnresolvedBehavior extends javax.media.j3d.Behavior {
+public class UnresolvedBehavior extends org.jogamp.java3d.Behavior {
 
     @Override
     public void initialize() {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnsupportedUniverseException.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/UnsupportedUniverseException.java
index a18902d..38d3cd4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/UnsupportedUniverseException.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/UnsupportedUniverseException.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io;
+package org.jogamp.java3d.utils.scenegraph.io;
 
 /**
  * Thrown if the VirtualUniverse subclass is not supported
  * by the writeUniverse calls.
  *
- * Currently only com.sun.j3d.utils.universe.SimpleUniverse is supported
+ * Currently only org.jogamp.java3d.utils.universe.SimpleUniverse is supported
  */
 public class UnsupportedUniverseException extends java.lang.Exception {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/doc-files/extensibility.html b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/doc-files/extensibility.html
index 113cd9b..d77e9bd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/doc-files/extensibility.html
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/doc-files/extensibility.html
@@ -66,13 +66,13 @@ class are then used for IO. The system does store the class name of
 the original object.
 <P>For example:
 <pre><font size=-1>
-public class MyBranchGroup extends javax.media.j3d.BranchGroup {
+public class MyBranchGroup extends org.jogamp.java3d.BranchGroup {
     private int myData;
     ....
 }
 </font></pre>
 <P>When the Scene Graph is written to a file and this node is
-encountered, the superclass javax.media.j3d.BranchGroup will be used
+encountered, the superclass org.jogamp.java3d.BranchGroup will be used
 to store all the state for the object so any children of
 MyBranchGroup, the capabilities, etc. will be stored, but myData will
 be lost. When the scene graph is loaded, MyBranchGroup will be
@@ -125,7 +125,7 @@ called in this order
 IO are show....</P>
 <h2>Behavior Example</h2>
 <pre><blockquote><font size=-1>
-public class BehaviorIO extends javax.media.j3d.Behavior implements SceneGraphIO
+public class BehaviorIO extends org.jogamp.java3d.Behavior implements SceneGraphIO
     private TransformGroup target;   // The TG on which this behavior acts
     private int targetRef;  // Object Reference for target
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/package.html b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/package.html
index 73e795c..73e795c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/package.html
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/Controller.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/Controller.java
index 748cd65..3acbd84 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/Controller.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/Controller.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -50,40 +50,40 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ListIterator;
 
-import javax.media.j3d.BoundingBox;
-import javax.media.j3d.BoundingPolytope;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.CapabilityNotSetException;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.SharedGroup;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4f;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
-import javax.vecmath.Tuple3d;
-import javax.vecmath.Tuple3f;
-import javax.vecmath.Tuple4d;
-import javax.vecmath.Tuple4f;
-import javax.vecmath.Vector3f;
-import javax.vecmath.Vector4d;
-import javax.vecmath.Vector4f;
-
-import com.sun.j3d.utils.scenegraph.io.NamedObjectException;
-import com.sun.j3d.utils.scenegraph.io.ObjectNotLoadedException;
-import com.sun.j3d.utils.scenegraph.io.SceneGraphStateProvider;
-import com.sun.j3d.utils.scenegraph.io.UnsupportedUniverseException;
-import com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe.SimpleUniverseState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.ImageComponentState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NullSceneGraphObjectState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
-import com.sun.j3d.utils.universe.SimpleUniverse;
+import org.jogamp.java3d.BoundingBox;
+import org.jogamp.java3d.BoundingPolytope;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.CapabilityNotSetException;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.SharedGroup;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Quat4f;
+import org.jogamp.vecmath.Tuple3d;
+import org.jogamp.vecmath.Tuple3f;
+import org.jogamp.vecmath.Tuple4d;
+import org.jogamp.vecmath.Tuple4f;
+import org.jogamp.vecmath.Vector3f;
+import org.jogamp.vecmath.Vector4d;
+import org.jogamp.vecmath.Vector4f;
+
+import org.jogamp.java3d.utils.scenegraph.io.NamedObjectException;
+import org.jogamp.java3d.utils.scenegraph.io.ObjectNotLoadedException;
+import org.jogamp.java3d.utils.scenegraph.io.SceneGraphStateProvider;
+import org.jogamp.java3d.utils.scenegraph.io.UnsupportedUniverseException;
+import org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe.SimpleUniverseState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.ImageComponentState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.NullSceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
+import org.jogamp.java3d.utils.universe.SimpleUniverse;
 
 /**
  * Provides code to control the reading and writing of Java3D objects to and
@@ -224,12 +224,12 @@ public abstract class Controller extends java.lang.Object {
               if (obj instanceof SceneGraphStateProvider)
                   state = ((SceneGraphStateProvider)obj).getStateClass();
               else
-                  state = Class.forName( "com.sun.j3d.utils.scenegraph.io.state."+name+"State" );
+                  state = Class.forName( "org.jogamp.java3d.utils.scenegraph.io.state."+name+"State" );
               ret = constructStateObj( symbol, state, obj.getClass() );
           } catch(ClassNotFoundException e) {
               ret = checkSuperClasses( symbol );
-              if (!(obj instanceof com.sun.j3d.utils.scenegraph.io.SceneGraphIO))
-                System.out.println("Could not find "+"com.sun.j3d.utils.scenegraph.io.state."+name+"State, using superclass "+ret.getClass().getName() );
+              if (!(obj instanceof org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO))
+                System.out.println("Could not find "+"org.jogamp.java3d.utils.scenegraph.io.state."+name+"State, using superclass "+ret.getClass().getName() );
               if (ret==null)
                   throw new SGIORuntimeException( "No State class for "+
                                                   obj.getClass().getName() );
@@ -247,8 +247,8 @@ public abstract class Controller extends java.lang.Object {
 
         try {
             Constructor construct = state.getConstructor(
-                                new Class[] { com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData.class,
-                                              com.sun.j3d.utils.scenegraph.io.retained.Controller.class
+                                new Class[] { org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData.class,
+                                              org.jogamp.java3d.utils.scenegraph.io.retained.Controller.class
                                             } );
             ret = (SceneGraphObjectState)construct.newInstance(
                                                 new Object[]{ symbol, this } );
@@ -287,7 +287,7 @@ public abstract class Controller extends java.lang.Object {
             String name = cl.getName();
             //System.out.println("Got superclass "+name);
             try {
-                state = Class.forName( "com.sun.j3d.utils.scenegraph.io.state."+name+"State" );
+                state = Class.forName( "org.jogamp.java3d.utils.scenegraph.io.state."+name+"State" );
             } catch(ClassNotFoundException e) {
                 state = null;
             }
@@ -333,8 +333,8 @@ public abstract class Controller extends java.lang.Object {
                 // System.out.println("Got class "+cl );
                 Constructor construct = cl.getConstructor(
                         new Class[] {
-                        com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData.class,
-                        com.sun.j3d.utils.scenegraph.io.retained.Controller.class} );
+                        org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData.class,
+                        org.jogamp.java3d.utils.scenegraph.io.retained.Controller.class} );
 
                 // System.out.println("Got constructor "+construct );
                 state = (SceneGraphObjectState)construct.newInstance(
@@ -484,8 +484,8 @@ public abstract class Controller extends java.lang.Object {
         //System.out.println(universeClass);
         if (universeClass.equals("null"))
             return null;
-        else if ( (universeClass.equals("com.sun.j3d.utils.universe.SimpleUniverse")) ||
-                  (universeClass.equals("com.sun.j3d.utils.universe.ConfiguredUniverse")) ) {
+        else if ( (universeClass.equals("org.jogamp.java3d.utils.universe.SimpleUniverse")) ||
+                  (universeClass.equals("org.jogamp.java3d.utils.universe.ConfiguredUniverse")) ) {
             SimpleUniverseState state = new SimpleUniverseState( this );
             state.readObject( in, canvas );
 
@@ -534,7 +534,7 @@ public abstract class Controller extends java.lang.Object {
 
         Class j3dClass = getNodeClassFromID( classID-1 );
         String j3dClassName = j3dClass.getName();
-        String stateClassName = "com.sun.j3d.utils.scenegraph.io.state."+j3dClassName+"State";
+        String stateClassName = "org.jogamp.java3d.utils.scenegraph.io.state."+j3dClassName+"State";
 
         SceneGraphObjectState stateObj = null;
         try {
@@ -562,68 +562,68 @@ public abstract class Controller extends java.lang.Object {
     // The order of this array dictates the ID's of classes therefore
     // changing the order of this array will break backward compatability
     Class[] j3dClasses = new Class[] {
-        javax.media.j3d.Alpha.class,
-        javax.media.j3d.Appearance.class,
-        javax.media.j3d.Billboard.class,
-        javax.media.j3d.BranchGroup.class,
-        javax.media.j3d.ColoringAttributes.class,
-        javax.media.j3d.ConeSound.class,
-        javax.media.j3d.DecalGroup.class,
-        javax.media.j3d.DirectionalLight.class,
-        javax.media.j3d.DistanceLOD.class,
-        javax.media.j3d.ExponentialFog.class,
-        javax.media.j3d.Font3D.class,
-        javax.media.j3d.Group.class,
-        javax.media.j3d.ImageComponent2D.class,
-        javax.media.j3d.ImageComponent3D.class,
-        javax.media.j3d.IndexedLineArray.class,
-        javax.media.j3d.IndexedLineStripArray.class,
-        javax.media.j3d.IndexedPointArray.class,
-        javax.media.j3d.IndexedQuadArray.class,
-        javax.media.j3d.IndexedTriangleArray.class,
-        javax.media.j3d.IndexedTriangleFanArray.class,
-        javax.media.j3d.IndexedTriangleStripArray.class,
-        javax.media.j3d.LinearFog.class,
-        javax.media.j3d.LineArray.class,
-        javax.media.j3d.LineAttributes.class,
-        javax.media.j3d.LineStripArray.class,
-        javax.media.j3d.Link.class,
-        javax.media.j3d.Material.class,
-        javax.media.j3d.Morph.class,
-        javax.media.j3d.OrderedGroup.class,
-        javax.media.j3d.OrientedShape3D.class,
-        javax.media.j3d.PathInterpolator.class,
-        javax.media.j3d.PointArray.class,
-        javax.media.j3d.PointAttributes.class,
-        javax.media.j3d.PositionInterpolator.class,
-        javax.media.j3d.PositionPathInterpolator.class,
-        javax.media.j3d.QuadArray.class,
-        javax.media.j3d.RenderingAttributes.class,
-        javax.media.j3d.RotationInterpolator.class,
-        javax.media.j3d.RotationPathInterpolator.class,
-        javax.media.j3d.RotPosPathInterpolator.class,
-        javax.media.j3d.RotPosScalePathInterpolator.class,
-        javax.media.j3d.ScaleInterpolator.class,
-        javax.media.j3d.Shape3D.class,
-        javax.media.j3d.SharedGroup.class,
-        javax.media.j3d.Soundscape.class,
-        javax.media.j3d.SpotLight.class,
-        javax.media.j3d.Switch.class,
-        javax.media.j3d.SwitchValueInterpolator.class,
-        javax.media.j3d.Text3D.class,
-        javax.media.j3d.Texture2D.class,
-        javax.media.j3d.Texture3D.class,
-        javax.media.j3d.TextureAttributes.class,
-        javax.media.j3d.TextureCubeMap.class,
-        javax.media.j3d.TextureUnitState.class,
-        javax.media.j3d.TransformGroup.class,
-        javax.media.j3d.TransformInterpolator.class,
-        javax.media.j3d.TransparencyAttributes.class,
-        javax.media.j3d.TransparencyInterpolator.class,
-        javax.media.j3d.TriangleArray.class,
-        javax.media.j3d.TriangleFanArray.class,
-        javax.media.j3d.TriangleStripArray.class,
-        javax.media.j3d.ViewPlatform.class
+        org.jogamp.java3d.Alpha.class,
+        org.jogamp.java3d.Appearance.class,
+        org.jogamp.java3d.Billboard.class,
+        org.jogamp.java3d.BranchGroup.class,
+        org.jogamp.java3d.ColoringAttributes.class,
+        org.jogamp.java3d.ConeSound.class,
+        org.jogamp.java3d.DecalGroup.class,
+        org.jogamp.java3d.DirectionalLight.class,
+        org.jogamp.java3d.DistanceLOD.class,
+        org.jogamp.java3d.ExponentialFog.class,
+        org.jogamp.java3d.Font3D.class,
+        org.jogamp.java3d.Group.class,
+        org.jogamp.java3d.ImageComponent2D.class,
+        org.jogamp.java3d.ImageComponent3D.class,
+        org.jogamp.java3d.IndexedLineArray.class,
+        org.jogamp.java3d.IndexedLineStripArray.class,
+        org.jogamp.java3d.IndexedPointArray.class,
+        org.jogamp.java3d.IndexedQuadArray.class,
+        org.jogamp.java3d.IndexedTriangleArray.class,
+        org.jogamp.java3d.IndexedTriangleFanArray.class,
+        org.jogamp.java3d.IndexedTriangleStripArray.class,
+        org.jogamp.java3d.LinearFog.class,
+        org.jogamp.java3d.LineArray.class,
+        org.jogamp.java3d.LineAttributes.class,
+        org.jogamp.java3d.LineStripArray.class,
+        org.jogamp.java3d.Link.class,
+        org.jogamp.java3d.Material.class,
+        org.jogamp.java3d.Morph.class,
+        org.jogamp.java3d.OrderedGroup.class,
+        org.jogamp.java3d.OrientedShape3D.class,
+        org.jogamp.java3d.PathInterpolator.class,
+        org.jogamp.java3d.PointArray.class,
+        org.jogamp.java3d.PointAttributes.class,
+        org.jogamp.java3d.PositionInterpolator.class,
+        org.jogamp.java3d.PositionPathInterpolator.class,
+        org.jogamp.java3d.QuadArray.class,
+        org.jogamp.java3d.RenderingAttributes.class,
+        org.jogamp.java3d.RotationInterpolator.class,
+        org.jogamp.java3d.RotationPathInterpolator.class,
+        org.jogamp.java3d.RotPosPathInterpolator.class,
+        org.jogamp.java3d.RotPosScalePathInterpolator.class,
+        org.jogamp.java3d.ScaleInterpolator.class,
+        org.jogamp.java3d.Shape3D.class,
+        org.jogamp.java3d.SharedGroup.class,
+        org.jogamp.java3d.Soundscape.class,
+        org.jogamp.java3d.SpotLight.class,
+        org.jogamp.java3d.Switch.class,
+        org.jogamp.java3d.SwitchValueInterpolator.class,
+        org.jogamp.java3d.Text3D.class,
+        org.jogamp.java3d.Texture2D.class,
+        org.jogamp.java3d.Texture3D.class,
+        org.jogamp.java3d.TextureAttributes.class,
+        org.jogamp.java3d.TextureCubeMap.class,
+        org.jogamp.java3d.TextureUnitState.class,
+        org.jogamp.java3d.TransformGroup.class,
+        org.jogamp.java3d.TransformInterpolator.class,
+        org.jogamp.java3d.TransparencyAttributes.class,
+        org.jogamp.java3d.TransparencyInterpolator.class,
+        org.jogamp.java3d.TriangleArray.class,
+        org.jogamp.java3d.TriangleFanArray.class,
+        org.jogamp.java3d.TriangleStripArray.class,
+        org.jogamp.java3d.ViewPlatform.class
     };
 
     public Class getNodeClassFromID( int classID ) {
@@ -635,7 +635,7 @@ public abstract class Controller extends java.lang.Object {
 
     // TODO Use a HashMap to eliminate the linear search for the class
     //
-    public int getNodeClassID( javax.media.j3d.SceneGraphObject node ) {
+    public int getNodeClassID( org.jogamp.java3d.SceneGraphObject node ) {
 
         int ret = -1;
         Class cl = node.getClass();
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fInputStream.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/J3fInputStream.java
index a05700b..707461c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fInputStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/J3fInputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fOutputStream.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/J3fOutputStream.java
index b25495c..9440f73 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/J3fOutputStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/J3fOutputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/PositionInputStream.java
index 15479af..5c2f103 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/PositionInputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.IOException;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/PositionOutputStream.java
index ae9b984..d3874bd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/PositionOutputStream.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.IOException;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
index 5a7839c..05da707 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
@@ -37,22 +37,22 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.CapabilityNotSetException;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.CapabilityNotSetException;
 
-import com.sun.j3d.utils.scenegraph.io.UnsupportedUniverseException;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
-import com.sun.j3d.utils.universe.SimpleUniverse;
+import org.jogamp.java3d.utils.scenegraph.io.UnsupportedUniverseException;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
+import org.jogamp.java3d.utils.universe.SimpleUniverse;
 
 public class RandomAccessFileControl extends Controller {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SGIORuntimeException.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/SGIORuntimeException.java
index 5698fbb..e2cbe5f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SGIORuntimeException.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/SGIORuntimeException.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 /**
  * This RuntimeException encapsulates a number of RuntimeErrors in the
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/StreamControl.java
index 8b1dc00..bb68718 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/StreamControl.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 
-import javax.media.j3d.BranchGroup;
+import org.jogamp.java3d.BranchGroup;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
 /**
  * Provides the infrastructure for ScenGraphStream Reader and Writer
@@ -126,7 +126,7 @@ public class StreamControl extends Controller {
             symbolTable.endUnsavedNodeComponentFrame();
 
             if (symbolTable.branchGraphHasDependencies( symbol.branchGraphID ))
-                throw new javax.media.j3d.DanglingReferenceException();
+                throw new org.jogamp.java3d.DanglingReferenceException();
 
             symbolTable.clearUnshared();
             symbolTable.writeTable( outputStream );
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTable.java
index 2eb441e..6141292 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTable.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataOutput;
 import java.io.IOException;
@@ -49,14 +49,14 @@ import java.util.LinkedList;
 import java.util.ListIterator;
 import java.util.Stack;
 
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.NamedObjectException;
-import com.sun.j3d.utils.scenegraph.io.ObjectNotLoadedException;
-import com.sun.j3d.utils.scenegraph.io.SceneGraphObjectReferenceControl;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NodeComponentState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NullSceneGraphObjectState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.NamedObjectException;
+import org.jogamp.java3d.utils.scenegraph.io.ObjectNotLoadedException;
+import org.jogamp.java3d.utils.scenegraph.io.SceneGraphObjectReferenceControl;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.NodeComponentState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.NullSceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
 /**
  * SymbolTable class for SceneGraph I/O.
@@ -343,7 +343,7 @@ public class SymbolTable extends java.lang.Object implements SceneGraphObjectRef
             data = new SymbolTableData( nodeID++, node, null, currentBranchGraphID );
             j3dNodeIndex.put( node, data );
             nodeIDIndex.add( data );
-        } else if (data.j3dNode instanceof javax.media.j3d.Node) {
+        } else if (data.j3dNode instanceof org.jogamp.java3d.Node) {
             throw new RuntimeException( "Object already in Symbol table "+ node );
         }
 
@@ -500,7 +500,7 @@ public class SymbolTable extends java.lang.Object implements SceneGraphObjectRef
         SymbolTableData symbol = getSymbol( node );
 
         if (symbol==null) {
-            if (node instanceof javax.media.j3d.Node) {
+            if (node instanceof org.jogamp.java3d.Node) {
                 symbol = createDanglingSymbol( node );
                 if (symbol.branchGraphID != currentBranchGraphID  ) {
                     //System.out.println("------------- Adding Reference "+symbol.nodeID+" "+node );  // TODO - remove
@@ -527,12 +527,12 @@ public class SymbolTable extends java.lang.Object implements SceneGraphObjectRef
                 sharedNodes.add( symbol );
             symbol.referenceCount++;
 
-            if (symbol.j3dNode instanceof javax.media.j3d.NodeComponent && symbol.referenceCount>1) {
+            if (symbol.j3dNode instanceof org.jogamp.java3d.NodeComponent && symbol.referenceCount>1) {
                 ((NodeComponentState)symbol.nodeState).addSubReference();
             }
 
             if (symbol.branchGraphID != currentBranchGraphID &&
-                symbol.j3dNode instanceof javax.media.j3d.Node ) {
+                symbol.j3dNode instanceof org.jogamp.java3d.Node ) {
                     // System.out.println("------------- Adding Reference "+symbol.nodeID+" "+symbol.j3dNode );    // TODO - remove
                     addInterGraphDependency( symbol );
                 }
@@ -840,7 +840,7 @@ public class SymbolTable extends java.lang.Object implements SceneGraphObjectRef
  * Use only during the load cycle
  */
     @Override
-    public javax.media.j3d.SceneGraphObject resolveReference(int nodeID) {
+    public org.jogamp.java3d.SceneGraphObject resolveReference(int nodeID) {
         return getJ3dNode( nodeID );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTableData.java
index 0122290..ff3fa08 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTableData.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.retained;
+package org.jogamp.java3d.utils.scenegraph.io.retained;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
 /**
  * Encapsulates all the data for a node which is stored in the Symbol table
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
index 047c125..3feb7ce 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.interpolators.KBKeyFrame;
-import com.sun.j3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.TransformInterpolatorState;
+import org.jogamp.java3d.utils.behaviors.interpolators.KBKeyFrame;
+import org.jogamp.java3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.TransformInterpolatorState;
 
 public class KBRotPosScaleSplinePathInterpolatorState extends TransformInterpolatorState {
 
@@ -109,7 +109,7 @@ public class KBRotPosScaleSplinePathInterpolatorState extends TransformInterpola
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     keyFrames.getClass() },
@@ -121,7 +121,7 @@ public class KBRotPosScaleSplinePathInterpolatorState extends TransformInterpola
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new KBRotPosScaleSplinePathInterpolator( null, null, axisOfTranslation, keyFrames );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
index 13679b2..4525afe 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.interpolators.RotPosScaleTCBSplinePathInterpolator;
-import com.sun.j3d.utils.behaviors.interpolators.TCBKeyFrame;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.TransformInterpolatorState;
+import org.jogamp.java3d.utils.behaviors.interpolators.RotPosScaleTCBSplinePathInterpolator;
+import org.jogamp.java3d.utils.behaviors.interpolators.TCBKeyFrame;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.TransformInterpolatorState;
 
 public class RotPosScaleTCBSplinePathInterpolatorState extends TransformInterpolatorState {
 
@@ -105,7 +105,7 @@ public class RotPosScaleTCBSplinePathInterpolatorState extends TransformInterpol
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     keyFrames.getClass() },
@@ -117,7 +117,7 @@ public class RotPosScaleTCBSplinePathInterpolatorState extends TransformInterpol
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new RotPosScaleTCBSplinePathInterpolator( null, null, axisOfTranslation, keyFrames );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
index bb00489..6ad16a5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.mouse;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BehaviorState;
+import org.jogamp.java3d.utils.behaviors.mouse.MouseBehavior;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.BehaviorState;
 
 public class MouseBehaviorState extends BehaviorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
index bbbf25a..5bd3e56 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.geometry.Box;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.geometry.Box;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BoxState extends PrimitiveState {
 
@@ -153,7 +153,7 @@ public class BoxState extends PrimitiveState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Box( xdim, ydim, zdim, primflags, null );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
index cc86626..cbafec8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Shape3D;
 
-import com.sun.j3d.utils.geometry.ColorCube;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.Shape3DState;
+import org.jogamp.java3d.utils.geometry.ColorCube;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.Shape3DState;
 
 public class ColorCubeState extends Shape3DState {
 
@@ -92,7 +92,7 @@ public class ColorCubeState extends Shape3DState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ColorCube( scale );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
index 8cb3133..e910e9f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.geometry.Cone;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.geometry.Cone;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ConeState extends PrimitiveState {
 
@@ -138,7 +138,7 @@ public class ConeState extends PrimitiveState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Cone( radius, height, primflags, xdivision, ydivision, null );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
index 0be313d..b760848 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.geometry.Cylinder;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.geometry.Cylinder;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class CylinderState extends PrimitiveState {
 
@@ -141,7 +141,7 @@ public class CylinderState extends PrimitiveState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Cylinder( radius, height, primflags, xdivision, ydivision, null );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
index 2c70298..3c1031b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import com.sun.j3d.utils.geometry.Primitive;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.GroupState;
+import org.jogamp.java3d.utils.geometry.Primitive;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.GroupState;
 
 public class PrimitiveState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
index d6ebaf9..8f41b83 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.geometry.Sphere;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.geometry.Sphere;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SphereState extends PrimitiveState {
 
@@ -108,7 +108,7 @@ public class SphereState extends PrimitiveState {
                                                 Float.TYPE,
                                                 Integer.TYPE,
                                                 Integer.TYPE,
-                                                javax.media.j3d.Appearance.class },
+                                                org.jogamp.java3d.Appearance.class },
                                         new Object[] {
                                                 new Float( radius ),
                                                 new Integer( primflags ),
@@ -119,7 +119,7 @@ public class SphereState extends PrimitiveState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Sphere( radius, primflags, divisions, null );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
index 41cff56..4a73ca4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.vecmath.Color3f;
 
-import com.sun.j3d.utils.geometry.Text2D;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.LeafState;
+import org.jogamp.java3d.utils.geometry.Text2D;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.LeafState;
 
 public class Text2DState extends LeafState {
 
@@ -134,7 +134,7 @@ public class Text2DState extends LeafState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Text2D( text, color, fontName, fontSize, fontStyle );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
index 6b0e547..c09f2d2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
 
-public class ImageComponent2DURL extends javax.media.j3d.ImageComponent2D {
+public class ImageComponent2DURL extends org.jogamp.java3d.ImageComponent2D {
 
     private java.net.URL url = null;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java
index 671b9e7..e170934 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
 
 /**
  * The listener interface which is called when a ImageComponent2DURL is
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
index 33b4c56..4224ff9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.ImageComponentState;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.ImageComponentState;
 
 public class ImageComponent2DURLState extends ImageComponentState {
 
@@ -90,7 +90,7 @@ public class ImageComponent2DURLState extends ImageComponentState {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return listener.createImageComponent( format, width, height, byReference, yUp, url );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
index fcd9000..a9e3102 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
-import com.sun.j3d.utils.universe.PlatformGeometry;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
+import org.jogamp.java3d.utils.universe.PlatformGeometry;
 
 public class PlatformGeometryState extends BranchGroupState {
 
@@ -52,7 +52,7 @@ public class PlatformGeometryState extends BranchGroupState {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new PlatformGeometry();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
index e550fd2..873c48f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,23 +45,23 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.HiResCoord;
-import javax.media.j3d.Locale;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Matrix4d;
-
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
-import com.sun.j3d.utils.universe.MultiTransformGroup;
-import com.sun.j3d.utils.universe.PlatformGeometry;
-import com.sun.j3d.utils.universe.SimpleUniverse;
-import com.sun.j3d.utils.universe.ViewerAvatar;
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.HiResCoord;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Matrix4d;
+
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
+import org.jogamp.java3d.utils.universe.MultiTransformGroup;
+import org.jogamp.java3d.utils.universe.PlatformGeometry;
+import org.jogamp.java3d.utils.universe.SimpleUniverse;
+import org.jogamp.java3d.utils.universe.ViewerAvatar;
+import org.jogamp.java3d.utils.universe.ViewingPlatform;
 
 public class SimpleUniverseState extends java.lang.Object {
 
@@ -267,8 +267,8 @@ public class SimpleUniverseState extends java.lang.Object {
                     ((BranchGroup)symbol.j3dNode).detach();
                 }
             }
-        } catch( javax.media.j3d.CapabilityNotSetException e ) {
-            throw new javax.media.j3d.CapabilityNotSetException(
+        } catch( org.jogamp.java3d.CapabilityNotSetException e ) {
+            throw new org.jogamp.java3d.CapabilityNotSetException(
 		"Locale BranchGraphs MUST have ALLOW_DETACH capability set" );
         }
     }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
index 6a2123c..6eaad3a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
-import com.sun.j3d.utils.universe.ViewerAvatar;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
+import org.jogamp.java3d.utils.universe.ViewerAvatar;
 
 public class ViewerAvatarState extends BranchGroupState {
 
@@ -51,7 +51,7 @@ public class ViewerAvatarState extends BranchGroupState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ViewerAvatar();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
index cb91547..2fa90af 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AlphaState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
index a383ea3..2b08849 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.AlternateAppearance;
-import javax.media.j3d.Appearance;
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Group;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.AlternateAppearance;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AlternateAppearanceState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
index af1fd5d..ffbac3a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.AmbientLight;
+import org.jogamp.java3d.AmbientLight;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AmbientLightState extends LightState {
 
@@ -50,7 +50,7 @@ public class AmbientLightState extends LightState {
 	super( symbol, control );
     }
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new AmbientLight();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
index 16679b9..683f1be 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
@@ -37,27 +37,27 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.ColoringAttributes;
-import javax.media.j3d.LineAttributes;
-import javax.media.j3d.Material;
-import javax.media.j3d.PointAttributes;
-import javax.media.j3d.PolygonAttributes;
-import javax.media.j3d.RenderingAttributes;
-import javax.media.j3d.TexCoordGeneration;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureAttributes;
-import javax.media.j3d.TextureUnitState;
-import javax.media.j3d.TransparencyAttributes;
-
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.ColoringAttributes;
+import org.jogamp.java3d.LineAttributes;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.PointAttributes;
+import org.jogamp.java3d.PolygonAttributes;
+import org.jogamp.java3d.RenderingAttributes;
+import org.jogamp.java3d.TexCoordGeneration;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.TextureUnitState;
+import org.jogamp.java3d.TransparencyAttributes;
+
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AppearanceState extends NodeComponentState {
 
@@ -184,7 +184,7 @@ public class AppearanceState extends NodeComponentState {
      }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Appearance();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
index 1763b9e..58a5e9f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.AuralAttributes;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.AuralAttributes;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AuralAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
index c45d23d..5b3e9e5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BackgroundSound;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.BackgroundSound;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BackgroundSoundState extends SoundState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
index 38eb163..07ed0c7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Background;
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.Background;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.ImageComponent2D;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BackgroundState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
index 6f1ed3c..241c5e6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Behavior;
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.Behavior;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BehaviorState extends LeafState {
 
@@ -64,8 +64,8 @@ public class BehaviorState extends LeafState {
         SceneGraphObject ret;
         try {
             ret = super.createNode( className );
-        } catch( com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException e ) {
-            ret = new com.sun.j3d.utils.scenegraph.io.UnresolvedBehavior();
+        } catch( org.jogamp.java3d.utils.scenegraph.io.retained.SGIORuntimeException e ) {
+            ret = new org.jogamp.java3d.utils.scenegraph.io.UnresolvedBehavior();
         }
 
         return ret;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
index e568ed2..1076879 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Billboard;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Billboard;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BillboardState extends BehaviorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
index ca1ef6f..04c6595 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class BoundingLeafState extends SceneGraphObjectState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
index 619b6c2..84a15cd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class BranchGroupState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
index 07a7c44..71e6d69 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Clip;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.Clip;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class ClipState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
index 28ebf36..e607764 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ColorInterpolator;
-import javax.media.j3d.Material;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.ColorInterpolator;
+import org.jogamp.java3d.Material;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ColorInterpolatorState extends InterpolatorState {
 
@@ -101,8 +101,8 @@ public class ColorInterpolatorState extends InterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
-                                                    javax.media.j3d.Material.class },
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
+                                                    org.jogamp.java3d.Material.class },
                                       new Object[] { null,
                                                      null } );
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
index c44e908..88ed6e7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ColoringAttributes;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.ColoringAttributes;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ColoringAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
index 07641ca..34f5bc1 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.CompressedGeometry;
-import javax.media.j3d.CompressedGeometryHeader;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.CompressedGeometry;
+import org.jogamp.java3d.CompressedGeometryHeader;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.vecmath.Point3d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class CompressedGeometryState extends GeometryState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
index bd7658f..1e7c8b7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ConeSound;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.ConeSound;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ConeSoundState extends PointSoundState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
index 7d63f01..a7b9c67 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.DecalGroup;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.DecalGroup;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DecalGroupState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
index 307a593..70050e6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DepthComponentFloat;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.DepthComponentFloat;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DepthComponentFloatState extends NodeComponentState {
 
@@ -106,7 +106,7 @@ public class DepthComponentFloatState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new DepthComponentFloat( width, height );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
index a263585..62c391c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DepthComponentInt;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.DepthComponentInt;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DepthComponentIntState extends NodeComponentState {
 
@@ -106,7 +106,7 @@ public class DepthComponentIntState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new DepthComponentInt( width, height );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
index 94efc93..ecf77ba 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DepthComponentNative;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.DepthComponentNative;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 /**
  * We have no access to the data inside a DepthComponentNative and
@@ -87,7 +87,7 @@ public class DepthComponentNativeState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new DepthComponentNative( width, height );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
index 0a314cd..87a049a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DirectionalLight;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.DirectionalLight;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DirectionalLightState extends LightState {
 
@@ -72,7 +72,7 @@ public class DirectionalLightState extends LightState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new DirectionalLight();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
index 3b53b66..7cf44b3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DistanceLOD;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.DistanceLOD;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class DistanceLODState extends LODState {
 
@@ -102,7 +102,7 @@ public class DistanceLODState extends LODState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new DistanceLOD( new float[ numDistances ] );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
index ce29ba5..ee549cc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ExponentialFog;
+import org.jogamp.java3d.ExponentialFog;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ExponentialFogState extends FogState {
 
@@ -69,7 +69,7 @@ public class ExponentialFogState extends FogState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ExponentialFog();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
index 2658f5d..a0447b9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Fog;
-import javax.media.j3d.Group;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.Fog;
+import org.jogamp.java3d.Group;
+import org.jogamp.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class FogState extends SceneGraphObjectState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
index 13b3582..07415ab 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
@@ -36,7 +36,7 @@
  * maintenance of any nuclear facility.
  *
  */
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.awt.Font;
 import java.awt.Shape;
@@ -46,12 +46,12 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Font3D;
-import javax.media.j3d.FontExtrusion;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.Font3D;
+import org.jogamp.java3d.FontExtrusion;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Font3DState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
index 6e13ba8..a0078bc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -51,23 +51,23 @@ import java.nio.ByteOrder;
 import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.J3DBuffer;
-import javax.vecmath.Color3b;
-import javax.vecmath.Color3f;
-import javax.vecmath.Color4b;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point3f;
-import javax.vecmath.TexCoord2f;
-import javax.vecmath.TexCoord3f;
-import javax.vecmath.Vector3f;
-
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.GeometryStripArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.J3DBuffer;
+import org.jogamp.vecmath.Color3b;
+import org.jogamp.vecmath.Color3f;
+import org.jogamp.vecmath.Color4b;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.TexCoord2f;
+import org.jogamp.vecmath.TexCoord3f;
+import org.jogamp.vecmath.Vector3f;
+
+import org.jogamp.java3d.internal.BufferWrapper;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class GeometryArrayState extends GeometryState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
index 65dd7ba..2753c0f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class GeometryState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
index 71e09b3..fd8cc9e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.GeometryStripArray;
+import org.jogamp.java3d.GeometryStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class GeometryStripArrayState extends GeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
index 6d9c97f..b1feb16 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Group;
-import javax.media.j3d.Node;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Node;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class GroupState extends NodeState {
 
@@ -95,8 +95,8 @@ public class GroupState extends NodeState {
   }
 
   private boolean checkProcessChildren() {
-      if (node instanceof com.sun.j3d.utils.scenegraph.io.SceneGraphIO)
-          return ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).saveChildren();
+      if (node instanceof org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)
+          return ((org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)node).saveChildren();
       else
           return processChildren();
   }
@@ -136,7 +136,7 @@ public class GroupState extends NodeState {
   }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Group();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
index a5c654a..54424bf 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.awt.image.BufferedImage;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.ImageComponent2D;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ImageComponent2DState extends ImageComponentState {
 
@@ -100,7 +100,7 @@ public class ImageComponent2DState extends ImageComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ImageComponent2D( format, bufferedImage, byReference, yUp );
     }
 }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
index 25a68b1..09e6f44 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.awt.image.BufferedImage;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ImageComponent3D;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.ImageComponent3D;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ImageComponent3DState extends ImageComponentState {
 
@@ -123,7 +123,7 @@ public class ImageComponent3DState extends ImageComponentState {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ImageComponent3D( format, bufferedImages, byReference, yUp );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
index b55bccc..b4d3105 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.awt.Point;
 import java.awt.image.BufferedImage;
@@ -61,11 +61,11 @@ import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import javax.imageio.ImageIO;
-import javax.media.j3d.ImageComponent;
+import org.jogamp.java3d.ImageComponent;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SGIORuntimeException;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class ImageComponentState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
index 8142739..0f56822 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -47,12 +47,12 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.IndexedGeometryArray;
-import javax.media.j3d.IndexedGeometryStripArray;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.IndexedGeometryArray;
+import org.jogamp.java3d.IndexedGeometryStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class IndexedGeometryArrayState extends GeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
index 45692e8..3fd6954 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedGeometryStripArray;
+import org.jogamp.java3d.IndexedGeometryStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class IndexedGeometryStripArrayState extends IndexedGeometryArrayState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
index f5ab90c..69486fc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedLineArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.IndexedLineArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedLineArrayState extends IndexedGeometryArrayState {
 
@@ -81,7 +81,7 @@ public class IndexedLineArrayState extends IndexedGeometryArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new IndexedLineArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, indexCount );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
index bd906ba..9106dfd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.IndexedLineStripArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.IndexedLineStripArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedLineStripArrayState extends IndexedGeometryStripArrayState {
 
@@ -69,7 +69,7 @@ public class IndexedLineStripArrayState extends IndexedGeometryStripArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new IndexedLineStripArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, indexCount, stripIndexCounts );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
index 767708c..1b4c0d5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedPointArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.IndexedPointArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedPointArrayState extends IndexedGeometryArrayState {
 
@@ -82,7 +82,7 @@ public class IndexedPointArrayState extends IndexedGeometryArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new IndexedPointArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, indexCount );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
index fa4f2eb..d4020e8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedQuadArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.IndexedQuadArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedQuadArrayState extends IndexedGeometryArrayState {
 
@@ -81,7 +81,7 @@ public class IndexedQuadArrayState extends IndexedGeometryArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new IndexedQuadArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, indexCount );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
index b1b96dc..c614e0a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedTriangleArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.IndexedTriangleArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedTriangleArrayState extends IndexedGeometryArrayState {
 
@@ -81,7 +81,7 @@ public class IndexedTriangleArrayState extends IndexedGeometryArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new IndexedTriangleArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, indexCount );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
index 1803ccb..e9e92c5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedTriangleFanArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.IndexedTriangleFanArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedTriangleFanArrayState extends IndexedGeometryStripArrayState {
 
@@ -84,7 +84,7 @@ public class IndexedTriangleFanArrayState extends IndexedGeometryStripArrayState
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new IndexedTriangleFanArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, indexCount, stripIndexCounts );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
index 3377516..838d7c6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.IndexedTriangleStripArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.IndexedTriangleStripArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class IndexedTriangleStripArrayState extends IndexedGeometryStripArrayState {
 
@@ -84,7 +84,7 @@ public class IndexedTriangleStripArrayState extends IndexedGeometryStripArraySta
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new IndexedTriangleStripArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, indexCount, stripIndexCounts );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
index ad6d85a..03b4706 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.Interpolator;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.Interpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class InterpolatorState extends BehaviorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
index 9c54cbb..cd89812 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.LOD;
-import javax.media.j3d.Switch;
+import org.jogamp.java3d.LOD;
+import org.jogamp.java3d.Switch;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class LODState extends BehaviorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
index 6533832..17b7078 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class LeafState extends NodeState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
index db2da52..1464bd6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Group;
-import javax.media.j3d.Light;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Light;
+import org.jogamp.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class LightState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
index 8d663fe..d9f6077 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.LineArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.LineArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LineArrayState extends GeometryArrayState {
 
@@ -67,7 +67,7 @@ public class LineArrayState extends GeometryArrayState {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new LineArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
index 14be6e3..7e9a88e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.LineAttributes;
+import org.jogamp.java3d.LineAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LineAttributesState extends NodeComponentState {
 
@@ -77,7 +77,7 @@ public class LineAttributesState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new LineAttributes();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
index 546f293..cbb9e06 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.LineStripArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.LineStripArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LineStripArrayState extends GeometryStripArrayState {
 
@@ -69,7 +69,7 @@ public class LineStripArrayState extends GeometryStripArrayState {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new LineStripArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, stripVertexCounts );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
index de9fa2a..8b7b4a5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.LinearFog;
+import org.jogamp.java3d.LinearFog;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LinearFogState extends FogState {
 
@@ -71,7 +71,7 @@ public class LinearFogState extends FogState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new LinearFog();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
index e64305f..06c26a1 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Link;
-import javax.media.j3d.SharedGroup;
+import org.jogamp.java3d.Link;
+import org.jogamp.java3d.SharedGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class LinkState extends LeafState {
 
@@ -96,7 +96,7 @@ public class LinkState extends LeafState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Link();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
index 5981e87..4531dc7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Material;
-import javax.vecmath.Color3f;
+import org.jogamp.java3d.Material;
+import org.jogamp.vecmath.Color3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class MaterialState extends NodeComponentState {
 
@@ -86,7 +86,7 @@ public class MaterialState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Material();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
index 5c8c42f..2ca2c51 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -45,10 +45,10 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.media.j3d.MediaContainer;
+import org.jogamp.java3d.MediaContainer;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class MediaContainerState extends NodeComponentState {
 
@@ -109,7 +109,7 @@ public class MediaContainerState extends NodeComponentState {
 	}
 
 	@Override
-	protected javax.media.j3d.SceneGraphObject createNode() {
+	protected org.jogamp.java3d.SceneGraphObject createNode() {
 		return new MediaContainer();
 	}
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
index 3d5c0e9..5be1bfd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Group;
-import javax.media.j3d.ModelClip;
-import javax.vecmath.Vector4d;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.ModelClip;
+import org.jogamp.vecmath.Vector4d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ModelClipState extends LeafState {
 
@@ -124,7 +124,7 @@ public class ModelClipState extends LeafState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ModelClip();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
index beff388..54a2361 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.Morph;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.GeometryArray;
+import org.jogamp.java3d.Morph;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class MorphState extends LeafState {
 
@@ -126,7 +126,7 @@ public class MorphState extends LeafState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Morph( null );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
index 96e2c7b..1338470 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.NodeComponent;
+import org.jogamp.java3d.NodeComponent;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class NodeComponentState extends SceneGraphObjectState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
index fc3fb84..f7b2f30 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Node;
+import org.jogamp.java3d.Node;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class NodeState extends SceneGraphObjectState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
index bdab412..d520fd9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class NullSceneGraphObjectState extends SceneGraphObjectState {
 
@@ -92,7 +92,7 @@ public class NullSceneGraphObjectState extends SceneGraphObjectState {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return null;
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
index 49ee4b7..734d4e9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.OrderedGroup;
+import org.jogamp.java3d.OrderedGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class OrderedGroupState extends GroupState {
 
@@ -78,7 +78,7 @@ public class OrderedGroupState extends GroupState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new OrderedGroup();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
index bb1685b..7b89004 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.OrientedShape3D;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.OrientedShape3D;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class OrientedShape3DState extends Shape3DState {
 
@@ -87,7 +87,7 @@ public class OrientedShape3DState extends Shape3DState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new OrientedShape3D();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
index 42ccb01..92be1a3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PathInterpolator;
+import org.jogamp.java3d.PathInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class PathInterpolatorState extends TransformInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
index c999a62..898a42c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PointAttributes;
+import org.jogamp.java3d.PointAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PointAttributesState extends NodeComponentState {
 
@@ -71,7 +71,7 @@ public class PointAttributesState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new PointAttributes();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
index 1d63077..4d14d88 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PointLight;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.PointLight;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PointLightState extends LightState {
 
@@ -74,7 +74,7 @@ public class PointLightState extends LightState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new PointLight();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
index f34ea1b..bd65bec 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PointSound;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.PointSound;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PointSoundState extends SoundState {
 
@@ -92,7 +92,7 @@ public class PointSoundState extends SoundState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new PointSound();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
index 0d39fc9..70d7b65 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PolygonAttributes;
+import org.jogamp.java3d.PolygonAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PolygonAttributesState extends NodeComponentState {
 
@@ -77,7 +77,7 @@ public class PolygonAttributesState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new PolygonAttributes();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
index c9d3de3..b2c317f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PositionInterpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.PositionInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PositionInterpolatorState extends TransformInterpolatorState {
 
@@ -74,14 +74,14 @@ public class PositionInterpolatorState extends TransformInterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class },
                                       new Object[] { null,
                                                      null } );
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new PositionInterpolator( null, null );
     }
 }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
index 71fa5f6..f0047bc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PositionPathInterpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.PositionPathInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class PositionPathInterpolatorState extends PathInterpolatorState {
 
@@ -84,7 +84,7 @@ public class PositionPathInterpolatorState extends PathInterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -97,7 +97,7 @@ public class PositionPathInterpolatorState extends PathInterpolatorState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new PositionPathInterpolator( null, null, new Transform3D(), knots, positions );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
index d3969dc..17c829e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.QuadArray;
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.QuadArray;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class QuadArrayState extends GeometryArrayState {
 
@@ -81,7 +81,7 @@ public class QuadArrayState extends GeometryArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new QuadArray(vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
index 199acd3..feb001e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.awt.Dimension;
 import java.awt.Point;
@@ -45,13 +45,13 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.DepthComponent;
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.Raster;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.DepthComponent;
+import org.jogamp.java3d.ImageComponent2D;
+import org.jogamp.java3d.Raster;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RasterState extends GeometryState {
 
@@ -134,7 +134,7 @@ public class RasterState extends GeometryState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Raster();
     }
 }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
index 89b262e..40a5956 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.RenderingAttributes;
+import org.jogamp.java3d.RenderingAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RenderingAttributesState extends NodeComponentState {
 
@@ -83,7 +83,7 @@ public class RenderingAttributesState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new RenderingAttributes();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
index cc05dba..89fd917 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.RotPosPathInterpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
+import org.jogamp.java3d.RotPosPathInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Quat4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotPosPathInterpolatorState extends PathInterpolatorState {
 
@@ -95,7 +95,7 @@ public class RotPosPathInterpolatorState extends PathInterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -111,7 +111,7 @@ public class RotPosPathInterpolatorState extends PathInterpolatorState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new RotPosPathInterpolator( null, null, new Transform3D(), knots, quats, positions );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
index 2a91071..9238766 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.RotPosScalePathInterpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
+import org.jogamp.java3d.RotPosScalePathInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Quat4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotPosScalePathInterpolatorState extends PathInterpolatorState {
 
@@ -101,7 +101,7 @@ public class RotPosScalePathInterpolatorState extends PathInterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -119,7 +119,7 @@ public class RotPosScalePathInterpolatorState extends PathInterpolatorState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new RotPosScalePathInterpolator( null, null, new Transform3D(), knots, quats, positions, scales );
     }
 }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
index 6ca5e1b..5ba0dae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Alpha;
-import javax.media.j3d.RotationInterpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Alpha;
+import org.jogamp.java3d.RotationInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotationInterpolatorState extends TransformInterpolatorState {
 
@@ -83,7 +83,7 @@ public class RotationInterpolatorState extends TransformInterpolatorState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new RotationInterpolator( null, null );
     }
 }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
index be3ed34..a081688 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.RotationPathInterpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Quat4f;
+import org.jogamp.java3d.RotationPathInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Quat4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class RotationPathInterpolatorState extends PathInterpolatorState {
 
@@ -87,7 +87,7 @@ public class RotationPathInterpolatorState extends PathInterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class,
                                                     Transform3D.class,
                                                     knots.getClass(),
@@ -101,7 +101,7 @@ public class RotationPathInterpolatorState extends PathInterpolatorState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new RotationPathInterpolator( null, null, new Transform3D(), knots, quats );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
index 1dfb902..6614d46 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ScaleInterpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.ScaleInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ScaleInterpolatorState extends TransformInterpolatorState {
 
@@ -74,7 +74,7 @@ public class ScaleInterpolatorState extends TransformInterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
                                                     TransformGroup.class },
                                       new Object[] { null,
                                                      null } );
@@ -82,7 +82,7 @@ public class ScaleInterpolatorState extends TransformInterpolatorState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ScaleInterpolator( null, null );
     }
 }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
index ec91c2f..fc07729 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -49,11 +49,11 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 
-import javax.media.j3d.SceneGraphObject;
+import org.jogamp.java3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SGIORuntimeException;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class SceneGraphObjectState {
 
@@ -89,8 +89,8 @@ public abstract class SceneGraphObjectState {
             nodeClassName = node.getClass().getName();
 
 	    try {
-                if (node instanceof com.sun.j3d.utils.scenegraph.io.SceneGraphIO)
-                    ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).createSceneGraphObjectReferences( control.getSymbolTable() );
+                if (node instanceof org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)
+                    ((org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)node).createSceneGraphObjectReferences( control.getSymbolTable() );
             } catch(Exception e) {
                 System.err.println("Exception in createSceneGraphObjectReferences");
                 e.printStackTrace();
@@ -107,7 +107,7 @@ public abstract class SceneGraphObjectState {
      * All references should be created in the constructor
      */
     public void writeObject( DataOutput out ) throws IOException {
-        boolean sgIO = node instanceof com.sun.j3d.utils.scenegraph.io.SceneGraphIO;
+        boolean sgIO = node instanceof org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO;
         out.writeBoolean( sgIO );
         out.writeInt( symbol.nodeID );
 
@@ -124,7 +124,7 @@ public abstract class SceneGraphObjectState {
         if (sgIO) {
             ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
 	    DataOutputStream tmpOut = new DataOutputStream( byteStream );
-            ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).writeSceneGraphObject( tmpOut );
+            ((org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)node).writeSceneGraphObject( tmpOut );
 	    tmpOut.close();
 	    out.writeInt( byteStream.size() );
 	    out.write( byteStream.toByteArray() );
@@ -159,15 +159,15 @@ public abstract class SceneGraphObjectState {
 
         if ( sgIO ) {
 	    if (control.getCurrentFileVersion()==1)
-                ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).readSceneGraphObject( in );
+                ((org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)node).readSceneGraphObject( in );
             else {
 	        int size = in.readInt();
-                if (node instanceof com.sun.j3d.utils.scenegraph.io.SceneGraphIO) {
+                if (node instanceof org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO) {
 	            byte[] bytes = new byte[size];
 		    in.readFully( bytes );
                     ByteArrayInputStream byteStream = new ByteArrayInputStream( bytes );
                     DataInputStream tmpIn = new DataInputStream( byteStream );
-                    ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).readSceneGraphObject( tmpIn );
+                    ((org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)node).readSceneGraphObject( tmpIn );
 		    tmpIn.close();
                 } else {
 	    	    in.skipBytes( size );
@@ -495,8 +495,8 @@ public abstract class SceneGraphObjectState {
      */
     public void buildGraph() {
         //System.err.println("Build Graph "+this);
-            if (node instanceof com.sun.j3d.utils.scenegraph.io.SceneGraphIO)
-                ((com.sun.j3d.utils.scenegraph.io.SceneGraphIO)node).restoreSceneGraphObjectReferences( control.getSymbolTable() );
+            if (node instanceof org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)
+                ((org.jogamp.java3d.utils.scenegraph.io.SceneGraphIO)node).restoreSceneGraphObjectReferences( control.getSymbolTable() );
     }
 
     public void cleanup() {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
index abd22a9..ef3fc61 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Geometry;
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Geometry;
+import org.jogamp.java3d.Shape3D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Shape3DState extends LeafState {
 
@@ -113,7 +113,7 @@ public class Shape3DState extends LeafState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Shape3D();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
index bcc95e9..726098d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.SharedGroup;
+import org.jogamp.java3d.SharedGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SharedGroupState extends GroupState {
 
@@ -52,7 +52,7 @@ public class SharedGroupState extends GroupState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new SharedGroup();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
index 79545be..6b22bfc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.MediaContainer;
-import javax.media.j3d.Sound;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.MediaContainer;
+import org.jogamp.java3d.Sound;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class SoundState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
index 396b997..567b8fd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.AuralAttributes;
-import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Soundscape;
+import org.jogamp.java3d.AuralAttributes;
+import org.jogamp.java3d.BoundingLeaf;
+import org.jogamp.java3d.Soundscape;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SoundscapeState extends LeafState {
 
@@ -95,7 +95,7 @@ public class SoundscapeState extends LeafState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Soundscape();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
index 31d5f9f..8ec4908 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.PointLight;
-import javax.media.j3d.SpotLight;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.PointLight;
+import org.jogamp.java3d.SpotLight;
+import org.jogamp.vecmath.Point3f;
+import org.jogamp.vecmath.Vector3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 // issue 654: should inherit from PointLightState, but too hard to refactor
 public class SpotLightState extends LightState {
@@ -97,7 +97,7 @@ public class SpotLightState extends LightState {
 	}
 
 	@Override
-	protected javax.media.j3d.SceneGraphObject createNode() {
+	protected org.jogamp.java3d.SceneGraphObject createNode() {
 		return new SpotLight();
 	}
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
index e828f17..ad64b5f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Switch;
+import org.jogamp.java3d.Switch;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SwitchState extends GroupState {
 
@@ -72,7 +72,7 @@ public class SwitchState extends GroupState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Switch();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
index 9150bb9..b40710d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Switch;
-import javax.media.j3d.SwitchValueInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Switch;
+import org.jogamp.java3d.SwitchValueInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class SwitchValueInterpolatorState extends InterpolatorState {
 
@@ -88,14 +88,14 @@ public class SwitchValueInterpolatorState extends InterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
-                                                    javax.media.j3d.Switch.class },
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
+                                                    org.jogamp.java3d.Switch.class },
                                       new Object[] { null,
                                                      null } );
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new SwitchValueInterpolator( null, null );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
index 43262e9..3dfc64f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TexCoordGeneration;
-import javax.vecmath.Vector4f;
+import org.jogamp.java3d.TexCoordGeneration;
+import org.jogamp.vecmath.Vector4f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TexCoordGenerationState extends NodeComponentState {
 
@@ -87,7 +87,7 @@ public class TexCoordGenerationState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TexCoordGeneration();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
index 493fd7b..1299480 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Font3D;
-import javax.media.j3d.Text3D;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.Font3D;
+import org.jogamp.java3d.Text3D;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Text3DState extends GeometryState {
 
@@ -116,7 +116,7 @@ public class Text3DState extends GeometryState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Text3D();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
index de146ea..eeef326 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Texture2D;
+import org.jogamp.java3d.ImageComponent2D;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Texture2D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Texture2DState extends TextureState {
 
@@ -135,7 +135,7 @@ public class Texture2DState extends TextureState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Texture2D( mipMapMode, format, width, height, boundaryWidth );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
index 30b025a..5d23289 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Texture3D;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.Texture3D;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Texture3DState extends TextureState {
 
@@ -98,7 +98,7 @@ public class Texture3DState extends TextureState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new Texture3D( mipMapMode, format, width, height, depth, boundaryWidth );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
index 3ed92e6..e910c48 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TextureAttributes;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Color4f;
-import javax.vecmath.Matrix4d;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Matrix4d;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureAttributesState extends NodeComponentState {
 
@@ -129,7 +129,7 @@ public class TextureAttributesState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TextureAttributes();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
index 9c45b7b..615fbc3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.ImageComponent;
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TextureCubeMap;
+import org.jogamp.java3d.ImageComponent;
+import org.jogamp.java3d.ImageComponent2D;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TextureCubeMap;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureCubeMapState extends TextureState {
 
@@ -108,7 +108,7 @@ public class TextureCubeMapState extends TextureState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TextureCubeMap( mipMapMode, format, width, boundaryWidth );
     }
 }
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
index eae418b..09b1b1d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ImageComponent;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureCubeMap;
-import javax.vecmath.Color4f;
-import javax.vecmath.Point3f;
+import org.jogamp.java3d.ImageComponent;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureCubeMap;
+import org.jogamp.vecmath.Color4f;
+import org.jogamp.vecmath.Point3f;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class TextureState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
index 4fd7862..da577ff 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
@@ -37,19 +37,19 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TexCoordGeneration;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureAttributes;
-import javax.media.j3d.TextureUnitState;
+import org.jogamp.java3d.TexCoordGeneration;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.TextureUnitState;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureUnitStateState extends NodeComponentState {
 
@@ -102,7 +102,7 @@ public class TextureUnitStateState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TextureUnitState();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
index 02c3615..8849335 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TransformGroupState extends GroupState {
 
@@ -83,7 +83,7 @@ public class TransformGroupState extends GroupState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TransformGroup();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
index 20b1758..642a6cd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.TransformInterpolator;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.TransformInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class TransformInterpolatorState extends InterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
index 0c45116..5ef2fe9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.TransparencyAttributes;
+import org.jogamp.java3d.TransparencyAttributes;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TransparencyAttributesState extends NodeComponentState {
 
@@ -75,7 +75,7 @@ public class TransparencyAttributesState extends NodeComponentState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TransparencyAttributes();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
index 99d67eb..f68f236 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
@@ -37,18 +37,18 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TransparencyAttributes;
-import javax.media.j3d.TransparencyInterpolator;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TransparencyAttributes;
+import org.jogamp.java3d.TransparencyInterpolator;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TransparencyInterpolatorState extends InterpolatorState {
 
@@ -97,14 +97,14 @@ public class TransparencyInterpolatorState extends InterpolatorState {
 
     @Override
     public SceneGraphObject createNode( Class j3dClass ) {
-        return createNode( j3dClass, new Class[] { javax.media.j3d.Alpha.class,
-                                                    javax.media.j3d.TransparencyAttributes.class },
+        return createNode( j3dClass, new Class[] { org.jogamp.java3d.Alpha.class,
+                                                    org.jogamp.java3d.TransparencyAttributes.class },
                                       new Object[] { null,
                                                      null } );
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TransparencyInterpolator( null, null );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
index 858e02b..1a29313 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TriangleArray;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TriangleArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TriangleArrayState extends GeometryArrayState {
 
@@ -81,7 +81,7 @@ public class TriangleArrayState extends GeometryArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TriangleArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
index 7489c8a..c269fae 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TriangleFanArray;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TriangleFanArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TriangleFanArrayState extends GeometryStripArrayState {
 
@@ -83,7 +83,7 @@ public class TriangleFanArrayState extends GeometryStripArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TriangleFanArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, stripVertexCounts );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
index d732071..4e218c7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TriangleStripArray;
+import org.jogamp.java3d.SceneGraphObject;
+import org.jogamp.java3d.TriangleStripArray;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TriangleStripArrayState extends GeometryStripArrayState {
 
@@ -84,7 +84,7 @@ public class TriangleStripArrayState extends GeometryStripArrayState {
     }
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new TriangleStripArray( vertexCount, vertexFormat, texCoordSetCount, texCoordSetMap, stripVertexCounts );
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
index 201c87e..380ed01 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.media.j3d.ViewPlatform;
+import org.jogamp.java3d.ViewPlatform;
 
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
+import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class ViewPlatformState extends LeafState {
 
@@ -75,7 +75,7 @@ public class ViewPlatformState extends LeafState {
 
 
     @Override
-    protected javax.media.j3d.SceneGraphObject createNode() {
+    protected org.jogamp.java3d.SceneGraphObject createNode() {
         return new ViewPlatform();
     }
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
index 8af44fc..3890370 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.transparency;
+package org.jogamp.java3d.utils.scenegraph.transparency;
 
 import java.util.Comparator;
 
-import javax.media.j3d.TransparencySortGeom;
+import org.jogamp.java3d.TransparencySortGeom;
 
 /**
  * Sample TransparencySortComparator which has the same functionality as
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java b/src/classes/share/org/jogamp/java3d/utils/scenegraph/transparency/TransparencySortController.java
index b50d5ea..f471b2a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/transparency/TransparencySortController.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.scenegraph.transparency;
+package org.jogamp.java3d.utils.scenegraph.transparency;
 
 import java.util.Comparator;
 
-import javax.media.j3d.TransparencySortGeom;
-import javax.media.j3d.TransparencySortMap;
-import javax.media.j3d.View;
+import org.jogamp.java3d.TransparencySortGeom;
+import org.jogamp.java3d.TransparencySortMap;
+import org.jogamp.java3d.View;
 
 /**
  * This class controls the Transparency Sorting scheme used by Java 3D when
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/package.html b/src/classes/share/org/jogamp/java3d/utils/scenegraph/transparency/package.html
index 710fa54..c7669ec 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/scenegraph/transparency/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.scenegraph.transparency</title>
+  <title>org.jogamp.java3d.utils.scenegraph.transparency</title>
 </head>
 <body>
 <p>Provides transparency sorting utility classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/shader/StringIO.java b/src/classes/share/org/jogamp/java3d/utils/shader/StringIO.java
index 1393289..fd35614 100644
--- a/src/classes/share/com/sun/j3d/utils/shader/StringIO.java
+++ b/src/classes/share/org/jogamp/java3d/utils/shader/StringIO.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.shader;
+package org.jogamp.java3d.utils.shader;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/src/classes/share/com/sun/j3d/utils/shader/package.html b/src/classes/share/org/jogamp/java3d/utils/shader/package.html
index b5102d9..fe01b81 100644
--- a/src/classes/share/com/sun/j3d/utils/shader/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/shader/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.shader</title>
+  <title>org.jogamp.java3d.utils.shader</title>
 </head>
 <body>
 <p>Provides shader utility classes.</p>
diff --git a/src/classes/share/com/sun/j3d/utils/timer/J3DTimer.java b/src/classes/share/org/jogamp/java3d/utils/timer/J3DTimer.java
index 8d8661f..6b2aeb8 100644
--- a/src/classes/share/com/sun/j3d/utils/timer/J3DTimer.java
+++ b/src/classes/share/org/jogamp/java3d/utils/timer/J3DTimer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.timer;
+package org.jogamp.java3d.utils.timer;
 
 /**
  * A High Resolution interval timer. The timer resolution is
diff --git a/src/classes/share/com/sun/j3d/utils/timer/package.html b/src/classes/share/org/jogamp/java3d/utils/timer/package.html
index b842c0a..a3af6aa 100644
--- a/src/classes/share/com/sun/j3d/utils/timer/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/timer/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.timer</title>
+  <title>org.jogamp.java3d.utils.timer</title>
 </head>
 <body>
 <p><i><b>Deprecated</b>: Use java.lang.System.nanoTime() instead.</i></p>
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigCommand.java
index a7ae5af..1af3f4f 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigCommand.java
@@ -37,14 +37,14 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.text.DecimalFormat;
 import java.text.FieldPosition;
 import java.util.Collection;
 
-import javax.vecmath.Matrix3d;
-import javax.vecmath.Matrix4d;
+import org.jogamp.vecmath.Matrix3d;
+import org.jogamp.vecmath.Matrix4d;
 
 /**
  * Contains the elements which compose a configuration file command,
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigContainer.java
index 7e61bfa..1a7001b 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigContainer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -389,7 +389,7 @@ public class ConfigContainer {
 	// instantiate the target object, and then apply the configuration
 	// properties to it.
 	try {
-	    objectClass = Class.forName("com.sun.j3d.utils.universe.Config" +
+	    objectClass = Class.forName("org.jogamp.java3d.utils.universe.Config" +
 					cmd.baseName) ;
 	}
 	catch (ClassNotFoundException e) {
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigDevice.java
index 2102acc..9b24d2d 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigDevice.java
@@ -37,8 +37,8 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
-import javax.media.j3d.InputDevice;
+package org.jogamp.java3d.utils.universe ;
+import org.jogamp.java3d.InputDevice;
 
 /**
  * Mostly empty now; ConfigObject provides all required methods.
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigObject.java
index 8051ada..4ad66ca 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigObject.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -142,10 +142,10 @@ class ConfigObject {
      *
      * (New{configType} {instanceName} {className})<p>
      *
-     * For example, (NewDevice tracker com.sun.j3d.input.LogitechTracker) will
+     * For example, (NewDevice tracker org.jogamp.java3d.input.LogitechTracker) will
      * first cause ConfigDevice to be instantiated, which will then be
      * initialized with this method.  After all the properties are collected,
-     * ConfigDevice will instantiate com.sun.j3d.input.LogitechTracker,
+     * ConfigDevice will instantiate org.jogamp.java3d.input.LogitechTracker,
      * evaluate its properties, and allow references to it in the
      * configuration file by the name "tracker".<p>
      *
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigPhysicalBody.java
index cd76a71..a45e66a 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigPhysicalBody.java
@@ -37,12 +37,12 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
-import javax.media.j3d.PhysicalBody;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.PhysicalBody;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point3d;
 
 class ConfigPhysicalBody extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigPhysicalEnvironment.java
index b9144ab..d31ebf2 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigPhysicalEnvironment.java
@@ -37,15 +37,15 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.util.ArrayList;
 
-import javax.media.j3d.InputDevice;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.vecmath.Matrix4d;
+import org.jogamp.java3d.InputDevice;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Matrix4d;
 
 class ConfigPhysicalEnvironment extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigScreen.java
index 4748675..f32e534 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigScreen.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.awt.Window;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.View;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.View;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point2d;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point2d;
 
 class ConfigScreen extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigSensor.java
index ba3a407..baa3fd3 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigSensor.java
@@ -37,10 +37,10 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
-import javax.media.j3d.Sensor;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.Sensor;
+import org.jogamp.vecmath.Point3d;
 
 class ConfigSensor extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigSexpression.java
index 7673343..b4b8320 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigSexpression.java
@@ -37,20 +37,20 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.io.IOException;
 import java.io.StreamTokenizer;
 import java.util.ArrayList;
 
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Matrix3d;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Point2d;
-import javax.vecmath.Point3d;
-import javax.vecmath.Point4d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.BoundingSphere;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Matrix3d;
+import org.jogamp.vecmath.Matrix4d;
+import org.jogamp.vecmath.Point2d;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Point4d;
+import org.jogamp.vecmath.Vector3d;
 
 class ConfigSexpression {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigView.java
index 00a3c0b..01b0047 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigView.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.media.j3d.PhysicalBody;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.View;
-import javax.vecmath.Point3d;
+import org.jogamp.java3d.PhysicalBody;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.View;
+import org.jogamp.vecmath.Point3d;
 
 class ConfigView extends ConfigObject {
     /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigViewPlatform.java
index 69320fb..2fdc593 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigViewPlatform.java
@@ -37,16 +37,16 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.util.ArrayList;
 
-import javax.media.j3d.Node;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.View;
-import javax.media.j3d.ViewPlatform;
-import javax.vecmath.Matrix4d;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.View;
+import org.jogamp.java3d.ViewPlatform;
+import org.jogamp.vecmath.Matrix4d;
 
 class ConfigViewPlatform extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigViewPlatformBehavior.java
index 2b0d10b..984192f 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfigViewPlatformBehavior.java
@@ -37,13 +37,13 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
-import javax.media.j3d.Bounds;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Matrix4d;
+import org.jogamp.java3d.Bounds;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.vecmath.Matrix4d;
 
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
+import org.jogamp.java3d.utils.behaviors.vp.ViewPlatformBehavior;
 
 class ConfigViewPlatformBehavior extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java b/src/classes/share/org/jogamp/java3d/utils/universe/ConfiguredUniverse.java
index 7b84b25..96bc119 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ConfiguredUniverse.java
@@ -37,17 +37,17 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
 import java.net.URL;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.HiResCoord;
-import javax.media.j3d.Locale;
-import javax.media.j3d.View;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.HiResCoord;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.View;
 
 /**
  * This utility class creates all the necessary objects on the view side of
diff --git a/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java b/src/classes/share/org/jogamp/java3d/utils/universe/LocaleFactory.java
index c00c030..721787c 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/LocaleFactory.java
@@ -37,11 +37,11 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
-import javax.media.j3d.HiResCoord;
-import javax.media.j3d.Locale;
-import javax.media.j3d.VirtualUniverse;
+import org.jogamp.java3d.HiResCoord;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.VirtualUniverse;
 
 /**
  * This interface defines a factory for creating Locale objects in a
diff --git a/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java b/src/classes/share/org/jogamp/java3d/utils/universe/MultiTransformGroup.java
index 173ebe3..0998a9d 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/MultiTransformGroup.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
-import javax.media.j3d.TransformGroup;
+import org.jogamp.java3d.TransformGroup;
 
 /**
  * A convenience class that effectively creates a series of TransformGroup
diff --git a/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java b/src/classes/share/org/jogamp/java3d/utils/universe/PlatformGeometry.java
index 8f0c037..351ad48 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/PlatformGeometry.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
-import javax.media.j3d.BranchGroup;
+import org.jogamp.java3d.BranchGroup;
 
 /**
  * This class holds any geometry that should be associated with the
diff --git a/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java b/src/classes/share/org/jogamp/java3d/utils/universe/SimpleUniverse.java
index 761ac2e..4e55b94 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/SimpleUniverse.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.net.URL;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.GraphicsConfigTemplate3D;
-import javax.media.j3d.HiResCoord;
-import javax.media.j3d.Locale;
-import javax.media.j3d.View;
-import javax.media.j3d.VirtualUniverse;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.GraphicsConfigTemplate3D;
+import org.jogamp.java3d.HiResCoord;
+import org.jogamp.java3d.Locale;
+import org.jogamp.java3d.View;
+import org.jogamp.java3d.VirtualUniverse;
 
-import com.sun.j3d.utils.geometry.Primitive;
+import org.jogamp.java3d.utils.geometry.Primitive;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java b/src/classes/share/org/jogamp/java3d/utils/universe/ViewInfo.java
index feb846b..86fcdd2 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ViewInfo.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe ;
+package org.jogamp.java3d.utils.universe ;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
@@ -53,17 +53,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Node;
-import javax.media.j3d.PhysicalBody;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.Screen3D;
-import javax.media.j3d.Sensor;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.media.j3d.ViewPlatform;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.Node;
+import org.jogamp.java3d.PhysicalBody;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.Screen3D;
+import org.jogamp.java3d.Sensor;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
+import org.jogamp.java3d.ViewPlatform;
+import org.jogamp.vecmath.Point3d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * Provides methods to extract synchronized transform information from a View.
diff --git a/src/classes/share/com/sun/j3d/utils/universe/Viewer.java b/src/classes/share/org/jogamp/java3d/utils/universe/Viewer.java
index 7553622..52c7a74 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/Viewer.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/Viewer.java
@@ -37,7 +37,7 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
@@ -53,18 +53,18 @@ import java.awt.event.WindowEvent;
 import java.lang.reflect.Constructor;
 import java.net.URL;
 
-import javax.media.j3d.AudioDevice;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.GraphicsConfigTemplate3D;
-import javax.media.j3d.PhysicalBody;
-import javax.media.j3d.PhysicalEnvironment;
-import javax.media.j3d.Screen3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
+import org.jogamp.java3d.AudioDevice;
+import org.jogamp.java3d.Canvas3D;
+import org.jogamp.java3d.GraphicsConfigTemplate3D;
+import org.jogamp.java3d.PhysicalBody;
+import org.jogamp.java3d.PhysicalEnvironment;
+import org.jogamp.java3d.Screen3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.View;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import com.sun.j3d.audioengines.AudioEngine3DL2;
+import org.jogamp.java3d.audioengines.AudioEngine3DL2;
 
 /**
  * The Viewer class holds all the information that describes the physical
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java b/src/classes/share/org/jogamp/java3d/utils/universe/ViewerAvatar.java
index 17367b3..36fe76f 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ViewerAvatar.java
@@ -37,9 +37,9 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
-import javax.media.j3d.BranchGroup;
+import org.jogamp.java3d.BranchGroup;
 
 /**
  * This class holds geomtry that should be associated with the View's
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java b/src/classes/share/org/jogamp/java3d/utils/universe/ViewingPlatform.java
index e740106..cf116a0 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/ViewingPlatform.java
@@ -37,21 +37,21 @@
  *
  */
 
-package com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.universe;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Group;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.View;
-import javax.media.j3d.ViewPlatform;
-import javax.vecmath.Vector3d;
+import org.jogamp.java3d.BranchGroup;
+import org.jogamp.java3d.Group;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.java3d.View;
+import org.jogamp.java3d.ViewPlatform;
+import org.jogamp.vecmath.Vector3d;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
+import org.jogamp.java3d.internal.J3dUtilsI18N;
+import org.jogamp.java3d.utils.behaviors.vp.ViewPlatformBehavior;
 
 /**
  * This class is used to set up the "view" side of a Java 3D scene graph.
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-examples.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/config-examples.html
index bab913b..bab913b 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-examples.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/config-examples.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/config-syntax.html
index b170cc0..e725146 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/config-syntax.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/config-syntax.html
@@ -1241,7 +1241,7 @@ longer instance name.  Either name may be used to identify the instance.</p>
 View platform behaviors often need sensors or canvases as event sources to
 drive the behavior action.  A subclass of ViewPlatformBehavior always gets the
 current ViewingPlatform through its 
-<a href="../../behaviors/vp/ViewPlatformBehavior.html#setViewingPlatform(com.sun.j3d.utils.universe.ViewingPlatform)">setViewingPlatform</a>
+<a href="../../behaviors/vp/ViewPlatformBehavior.html#setViewingPlatform(org.jogamp.java3d.utils.universe.ViewingPlatform)">setViewingPlatform</a>
 method.  When the behavior is initialized, the canvases used by the
 ViewingPlatform can be retrieved by calling its 
 <a href="../ViewingPlatform.html#getViewers()">getViewers</a> method and
@@ -1289,7 +1289,7 @@ method of Behavior.
 <h4>
 <a NAME="HomeTransform"></a>HomeTransform</h4>
 See the ViewPlatformBehavior method 
-<a href="../../behaviors/vp/ViewPlatformBehavior.html#setHomeTransform(javax.media.j3d.Transform3D)">setHomeTransform</a>.
+<a href="../../behaviors/vp/ViewPlatformBehavior.html#setHomeTransform(org.jogamp.java3d.Transform3D)">setHomeTransform</a>.
 The property value must be a 4D matrix.
 </blockquote>
 <p>
@@ -1447,7 +1447,7 @@ Returns a 4D matrix that translates by the given X, Y, and Z values.</p>
 <p>
 Returns a 4D matrix that rotates by the given Euler angles around static X, Y,
 and Z basis vectors: first about X, then Y, and then Z.  See the 
-<a href="../../../../../../javax/media/j3d/Transform3D.html#setEuler(javax.vecmath.Vector3d)">setEuler</a>
+<a href="../../../../../../javax/media/j3d/Transform3D.html#setEuler(org.jogamp.vecmath.Vector3d)">setEuler</a>
 method of Transform3D.</p>
 <hr>
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-behavior.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-behavior.html
index 97c46d8..1c6598d 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-behavior.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-behavior.html
@@ -73,7 +73,7 @@
 // the 3rd argument is the name of the ViewPlatformBehavior subclass.  It is
 // instantiated through introspection.
 // 
-(NewViewPlatformBehavior vpb com.sun.j3d.utils.behaviors.vp.OrbitBehavior)
+(NewViewPlatformBehavior vpb org.jogamp.java3d.utils.behaviors.vp.OrbitBehavior)
 
 // Set the scheduling bounds to be a BoundingSphere with its center at 
 // (0.0 0.0 0.0) and an infinite radius.
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-stereo.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-stereo.html
index 0a91eed..0a91eed 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-stereo.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-stereo.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-vr.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-vr.html
index 4c18317..a2e07ac 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-vr.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-vr.html
@@ -74,7 +74,7 @@
                                   (Translate  0.199 0.376 0.000)))
 
 // Configure the head tracker.
-(NewDevice      tracker1 com.sun.j3d.input.LogitechTracker)
+(NewDevice      tracker1 org.jogamp.java3d.input.LogitechTracker)
 (DeviceProperty tracker1 SerialPort "/dev/ttya")
 (DeviceProperty tracker1 ReceiverBaseline     0.1450)
 (DeviceProperty tracker1 ReceiverLeftLeg      0.0875)
@@ -83,7 +83,7 @@
 (DeviceProperty tracker1 RealtimeSerialBuffer true)
 
 // Configure the 6DOF wand.
-(NewDevice      tracker2 com.sun.j3d.input.LogitechTracker)
+(NewDevice      tracker2 org.jogamp.java3d.input.LogitechTracker)
 (DeviceProperty tracker2 SerialPort "/dev/ttyb")
 (DeviceProperty tracker2 ReceiverBaseline     0.0700)
 (DeviceProperty tracker2 ReceiverLeftLeg      0.0625)
@@ -95,7 +95,7 @@
 (DeviceProperty tracker1 Slave (Device tracker2))
 
 // Create a 2D mouse valuator.
-(NewDevice      mouse com.sun.j3d.input.Mouse2DValuator)
+(NewDevice      mouse org.jogamp.java3d.input.Mouse2DValuator)
 (DeviceProperty mouse Components (Canvas3D center))
 
 // Create logical names for the available sensors.
@@ -133,7 +133,7 @@
 
 // Create a view platform behavior.  
 // 
-(NewViewPlatformBehavior vpb com.sun.j3d.utils.behaviors.vp.WandViewBehavior)
+(NewViewPlatformBehavior vpb org.jogamp.java3d.utils.behaviors.vp.WandViewBehavior)
 
 (ViewPlatformBehaviorProperty vpb Sensor6D (Sensor mouse6d))
 (ViewPlatformBehaviorProperty vpb Sensor2D (Sensor mouse2d))
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-window.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-window.html
index 3ff401f..3ff401f 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1-window.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1-window.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1.html
index 1f7f17b..1f7f17b 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x1.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x1.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x2-flat.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x2-flat.html
index 9391af2..9391af2 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x2-flat.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x2-flat.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x2-rot30.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x2-rot30.html
index ca5fdd6..ca5fdd6 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x2-rot30.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x2-rot30.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-cave-vr.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x3-cave-vr.html
index fcc58b4..7ad30c4 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-cave-vr.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x3-cave-vr.html
@@ -68,7 +68,7 @@
 
 // Configure the head tracker.
 // 
-(NewDevice      tracker1 com.sun.j3d.input.LogitechTracker)
+(NewDevice      tracker1 org.jogamp.java3d.input.LogitechTracker)
 (DeviceProperty tracker1 SerialPort "/dev/ttya") // Unix paths need quoting.
 (DeviceProperty tracker1 TransmitterBaseline            0.4600)
 (DeviceProperty tracker1 TransmitterLeftLeg             0.4400)
@@ -76,7 +76,7 @@
 
 // Configure an InputDevice to use for a 6 degree of freedom wand.
 // 
-(NewDevice      tracker2 com.sun.j3d.input.LogitechTracker)
+(NewDevice      tracker2 org.jogamp.java3d.input.LogitechTracker)
 (DeviceProperty tracker2 SerialPort "/dev/ttyb")
 (DeviceProperty tracker2 ReceiverBaseline     0.0700)
 (DeviceProperty tracker2 ReceiverLeftLeg      0.0625)
@@ -176,7 +176,7 @@
 
 // Create a view platform behavior for the 6DOF sensor.
 // 
-(NewViewPlatformBehavior vpb com.sun.j3d.utils.behaviors.vp.WandViewBehavior)
+(NewViewPlatformBehavior vpb org.jogamp.java3d.utils.behaviors.vp.WandViewBehavior)
 
 (ViewPlatformBehaviorProperty vpb Sensor6D sensor6d)
 (ViewPlatformBehaviorProperty vpb ButtonAction6D 2 GrabView)
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-cave.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x3-cave.html
index 9b0298b..9b0298b 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-cave.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x3-cave.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-rot45.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x3-rot45.html
index 927dbd8..927dbd8 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d1x3-rot45.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d1x3-rot45.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d2x2-flat.html b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d2x2-flat.html
index af6f62f..af6f62f 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/doc-files/j3d2x2-flat.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/doc-files/j3d2x2-flat.html
diff --git a/src/classes/share/com/sun/j3d/utils/universe/package.html b/src/classes/share/org/jogamp/java3d/utils/universe/package.html
index 1ef0eaf..06c31db 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/package.html
+++ b/src/classes/share/org/jogamp/java3d/utils/universe/package.html
@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>com.sun.j3d.utils.universe</title>
+  <title>org.jogamp.java3d.utils.universe</title>
 </head>
 <body>
 <p>Provides utility classes for setting up the Java 3D universe,