120 files changed, 136 insertions, 138 deletions

diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStateProvider.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
index 070fad6..5aa9071 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/SceneGraphStateProvider.java
@@ -39,7 +39,7 @@
 
 package org.jogamp.java3d.utils.scenegraph.io;
 
-import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.SceneGraphObjectState;
 
 /**
  * This interface allows developers to provide their own custom IO control for
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/Controller.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/Controller.java
index 3acbd84..49b6fc0 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/Controller.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/Controller.java
@@ -78,10 +78,10 @@ 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.scenegraph.io.state.org.jogamp.java3d.ImageComponentState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.NullSceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.universe.SimpleUniverseState;
 import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
 import org.jogamp.java3d.utils.universe.SimpleUniverse;
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
index 05da707..831ee6b 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
@@ -49,8 +49,8 @@ import org.jogamp.java3d.Canvas3D;
 import org.jogamp.java3d.CapabilityNotSetException;
 
 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.scenegraph.io.state.org.jogamp.java3d.BranchGroupState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.SceneGraphObjectState;
 import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
 import org.jogamp.java3d.utils.universe.SimpleUniverse;
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/StreamControl.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/StreamControl.java
index bb68718..f77dd00 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/StreamControl.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/StreamControl.java
@@ -45,8 +45,7 @@ import java.io.IOException;
 import java.util.HashMap;
 
 import org.jogamp.java3d.BranchGroup;
-
-import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.SceneGraphObjectState;
 
 /**
  * Provides the infrastructure for ScenGraphStream Reader and Writer
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTable.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTable.java
index 6141292..93386a4 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTable.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTable.java
@@ -54,9 +54,9 @@ import org.jogamp.java3d.SceneGraphObject;
 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.NodeComponentState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.NullSceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.SceneGraphObjectState;
 
 /**
  * SymbolTable class for SceneGraph I/O.
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTableData.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTableData.java
index ff3fa08..04cafe4 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTableData.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/retained/SymbolTableData.java
@@ -44,8 +44,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.jogamp.java3d.SceneGraphObject;
-
-import org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.SceneGraphObjectState;
 
 /**
  * Encapsulates all the data for a node which is stored in the Symbol table
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AlphaState.java
index 2fa90af..51c8e60 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AlphaState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AlternateAppearanceState.java
index 2b08849..f8535e9 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AlternateAppearanceState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AmbientLightState.java
index ffbac3a..542f35d 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AmbientLightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.AmbientLight;
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AppearanceState.java
index 683f1be..f0b6af2 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AppearanceState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AuralAttributesState.java
index 58a5e9f..e2d8ae5 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/AuralAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BackgroundSoundState.java
index 5b3e9e5..bede01f 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BackgroundSoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BackgroundState.java
index 07ed0c7..1594c35 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BackgroundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BehaviorState.java
index 241c5e6..ba6724e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BehaviorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BillboardState.java
index 1076879..c99ee3e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BillboardState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BoundingLeafState.java
index 04c6595..2aeb577 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BoundingLeafState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BranchGroupState.java
index 84a15cd..4305245 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/BranchGroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.BranchGroup;
 import org.jogamp.java3d.SceneGraphObject;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ClipState.java
index 71e6d69..6789b5f 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ClipState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ColorInterpolatorState.java
index e607764..b8e6d74 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ColorInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ColoringAttributesState.java
index 88ed6e7..d4acdf3 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ColoringAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/CompressedGeometryState.java
index 34f5bc1..9190bc4 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/CompressedGeometryState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ConeSoundState.java
index 1e7c8b7..ded2141 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ConeSoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DecalGroupState.java
index a7b9c67..4972403 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DecalGroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.DecalGroup;
 import org.jogamp.java3d.SceneGraphObject;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DepthComponentFloatState.java
index 70050e6..e49297b 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DepthComponentFloatState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DepthComponentIntState.java
index 62c391c..c94774c 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DepthComponentIntState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DepthComponentNativeState.java
index ecf77ba..21e8290 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DepthComponentNativeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DirectionalLightState.java
index 87a049a..5ff54a4 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DirectionalLightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DistanceLODState.java
index 7cf44b3..ec10310 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/DistanceLODState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ExponentialFogState.java
index ee549cc..702858b 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ExponentialFogState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/FogState.java
index a0447b9..c05298a 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/FogState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Font3DState.java
index 07415ab..1a9967a 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Font3DState.java
@@ -36,7 +36,7 @@
  * maintenance of any nuclear facility.
  *
  */
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.awt.Font;
 import java.awt.Shape;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GeometryArrayState.java
index a0078bc..da7eb21 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GeometryArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GeometryState.java
index 2753c0f..b2ec188 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GeometryState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
 import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GeometryStripArrayState.java
index fd8cc9e..d487fd1 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GeometryStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GroupState.java
index b1feb16..49ddce7 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/GroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ImageComponent2DState.java
index 54424bf..54791f8 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ImageComponent2DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.awt.image.BufferedImage;
 import java.io.DataInput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ImageComponent3DState.java
index 09e6f44..054ae8b 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ImageComponent3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.awt.image.BufferedImage;
 import java.io.DataInput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ImageComponentState.java
index b4d3105..7d927c3 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ImageComponentState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.awt.Point;
 import java.awt.image.BufferedImage;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedGeometryArrayState.java
index 0f56822..fe555a0 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedGeometryArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedGeometryStripArrayState.java
index 3fd6954..11c92ea 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedGeometryStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedLineArrayState.java
index 69486fc..61dd340 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedLineArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedLineStripArrayState.java
index 9106dfd..ea5a41f 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedLineStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.IndexedLineStripArray;
 import org.jogamp.java3d.SceneGraphObject;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedPointArrayState.java
index 1b4c0d5..c59a019 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedPointArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedQuadArrayState.java
index d4020e8..4bbcf9e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedQuadArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedTriangleArrayState.java
index c614e0a..c1edfe2 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedTriangleArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedTriangleFanArrayState.java
index e9e92c5..4ab59ed 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedTriangleFanArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedTriangleStripArrayState.java
index 838d7c6..7329b8d 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/IndexedTriangleStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/InterpolatorState.java
index 03b4706..8e14b99 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/InterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LODState.java
index cd89812..e2f6654 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LODState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LeafState.java
index 17b7078..2cf2118 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LeafState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.utils.scenegraph.io.retained.Controller;
 import org.jogamp.java3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LightState.java
index 1464bd6..b5194e5 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LineArrayState.java
index d9f6077..18d9076 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LineArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.LineArray;
 import org.jogamp.java3d.SceneGraphObject;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LineAttributesState.java
index 7e9a88e..39d7947 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LineAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LineStripArrayState.java
index cbb9e06..e3bc78c 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LineStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.LineStripArray;
 import org.jogamp.java3d.SceneGraphObject;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LinearFogState.java
index 8b7b4a5..359b52e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LinearFogState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LinkState.java
index 06c26a1..e8777a9 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/LinkState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/MaterialState.java
index 4531dc7..9ee99a5 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/MaterialState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/MediaContainerState.java
index 2ca2c51..61ce989 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MediaContainerState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/MediaContainerState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ModelClipState.java
index 5be1bfd..24e0c49 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ModelClipState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/MorphState.java
index 54a2361..5c35a1e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/MorphState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/NodeComponentState.java
index 1338470..067b3cf 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/NodeComponentState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/NodeState.java
index f7b2f30..705241f 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/NodeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/NullSceneGraphObjectState.java
index d520fd9..7d12bfd 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/NullSceneGraphObjectState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/OrderedGroupState.java
index 734d4e9..2a1e488 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/OrderedGroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/OrientedShape3DState.java
index 7b89004..c7ac7fe 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/OrientedShape3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PathInterpolatorState.java
index 92be1a3..6125ccb 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PointAttributesState.java
index 898a42c..c162c47 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PointAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PointLightState.java
index 4d14d88..4f6449a 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PointLightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PointSoundState.java
index bd65bec..369ffab 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PointSoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PolygonAttributesState.java
index 70d7b65..fd5a1a6 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PolygonAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PositionInterpolatorState.java
index b2c317f..ac94338 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PositionInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PositionPathInterpolatorState.java
index f0047bc..3997814 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/PositionPathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/QuadArrayState.java
index 17c829e..b8f9d31 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/QuadArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RasterState.java
index feb001e..d22b214 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RasterState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.awt.Dimension;
 import java.awt.Point;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RenderingAttributesState.java
index 40a5956..4d7000b 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RenderingAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotPosPathInterpolatorState.java
index 89fd917..6694b4f 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotPosPathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotPosScalePathInterpolatorState.java
index 9238766..db098ee 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotPosScalePathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotationInterpolatorState.java
index 5ba0dae..4590a52 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotationInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotationPathInterpolatorState.java
index a081688..08458aa 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/RotationPathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ScaleInterpolatorState.java
index 6614d46..6fd4335 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ScaleInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SceneGraphObjectState.java
index fc07729..f2b0750 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SceneGraphObjectState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Shape3DState.java
index ef3fc61..2c789af 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Shape3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SharedGroupState.java
index 726098d..580125d 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SharedGroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.SharedGroup;
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SoundState.java
index 6b22bfc..22422a4 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SoundState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SoundscapeState.java
index 567b8fd..4105b2b 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SoundscapeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SpotLightState.java
index 8ec4908..829c213 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SpotLightState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SwitchState.java
index ad64b5f..2cacb78 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SwitchState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SwitchValueInterpolatorState.java
index b40710d..160a858 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/SwitchValueInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TexCoordGenerationState.java
index 3dfc64f..faa67b1 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TexCoordGenerationState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Text3DState.java
index 1299480..ef091df 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Text3DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Text3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Texture2DState.java
index eeef326..a6a5eb1 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Texture2DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Texture3DState.java
index 5d23289..a31fc16 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/Texture3DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureAttributesState.java
index e910c48..97b21b0 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureCubeMapState.java
index 615fbc3..3231630 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureCubeMapState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import org.jogamp.java3d.ImageComponent;
 import org.jogamp.java3d.ImageComponent2D;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureState.java
index 09b1b1d..31fa1bf 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureUnitStateState.java
index da577ff..912870f 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TextureUnitStateState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransformGroupState.java
index 8849335..f331342 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransformGroupState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransformInterpolatorState.java
index 642a6cd..d71a3fa 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransformInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransparencyAttributesState.java
index 5ef2fe9..59f78be 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransparencyAttributesState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransparencyInterpolatorState.java
index f68f236..e316b01 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TransparencyInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TriangleArrayState.java
index 1a29313..d207b17 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TriangleArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TriangleFanArrayState.java
index c269fae..222b43d 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TriangleFanArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TriangleStripArrayState.java
index 4e218c7..b2f2e1d 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/TriangleStripArrayState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ViewPlatformState.java
index 380ed01..a33e8fb 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/ViewPlatformState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.javax.media.j3d;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
index 3feb7ce..0e9c8cd 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.behaviors.interpolators;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -51,7 +51,7 @@ 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.TransformInterpolatorState;
 
 public class KBRotPosScaleSplinePathInterpolatorState extends TransformInterpolatorState {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
index 4525afe..1f9b6ea 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.behaviors.interpolators;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -51,7 +51,7 @@ import org.jogamp.java3d.utils.behaviors.interpolators.RotPosScaleTCBSplinePathI
 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.TransformInterpolatorState;
 
 public class RotPosScaleTCBSplinePathInterpolatorState extends TransformInterpolatorState {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/behaviors/mouse/MouseBehaviorState.java
index 6ad16a5..339c901 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/behaviors/mouse/MouseBehaviorState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.mouse;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.behaviors.mouse;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,7 +48,7 @@ import org.jogamp.java3d.TransformGroup;
 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.BehaviorState;
 
 public class MouseBehaviorState extends BehaviorState {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/BoxState.java
index 5bd3e56..1c33fe2 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/BoxState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/ColorCubeState.java
index cbafec8..40eac0e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/ColorCubeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -49,7 +49,7 @@ import org.jogamp.java3d.Shape3D;
 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.Shape3DState;
 
 public class ColorCubeState extends Shape3DState {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/ConeState.java
index e910e9f..36fd69e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/ConeState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/CylinderState.java
index b760848..8074d06 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/CylinderState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/PrimitiveState.java
index 3c1031b..3c6ff3e 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/PrimitiveState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,7 +46,7 @@ import java.io.IOException;
 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.GroupState;
 
 public class PrimitiveState extends GroupState {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/SphereState.java
index 8f41b83..f85394d 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/SphereState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/Text2DState.java
index 4a73ca4..7f30f57 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/geometry/Text2DState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -50,7 +50,7 @@ import org.jogamp.vecmath.Color3f;
 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.LeafState;
 
 public class Text2DState extends LeafState {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/image/ImageComponent2DURL.java
index c09f2d2..2fe0e6a 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURL.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/image/ImageComponent2DURL.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.image;
 
 public class ImageComponent2DURL extends org.jogamp.java3d.ImageComponent2D {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/image/ImageComponent2DURLIOListener.java
index e170934..385c5c0 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLIOListener.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/image/ImageComponent2DURLIOListener.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.image;
 
 /**
  * The listener interface which is called when a ImageComponent2DURL is
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/image/ImageComponent2DURLState.java
index 4224ff9..c43aeb1 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/image/ImageComponent2DURLState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.image;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,7 +47,7 @@ import org.jogamp.java3d.SceneGraphObject;
 
 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;
+import org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.ImageComponentState;
 
 public class ImageComponent2DURLState extends ImageComponentState {
 
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/universe/PlatformGeometryState.java
index a9e3102..983a35b 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/universe/PlatformGeometryState.java
@@ -37,11 +37,11 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.universe;
 
 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.scenegraph.io.state.org.jogamp.java3d.BranchGroupState;
 import org.jogamp.java3d.utils.universe.PlatformGeometry;
 
 public class PlatformGeometryState extends BranchGroupState {
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/universe/SimpleUniverseState.java
index 873c48f..5307dfd 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/universe/SimpleUniverseState.java
@@ -37,7 +37,7 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.universe;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -55,7 +55,7 @@ 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.scenegraph.io.state.org.jogamp.java3d.SceneGraphObjectState;
 import org.jogamp.java3d.utils.universe.ConfiguredUniverse;
 import org.jogamp.java3d.utils.universe.MultiTransformGroup;
 import org.jogamp.java3d.utils.universe.PlatformGeometry;
diff --git a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/universe/ViewerAvatarState.java
index 6eaad3a..7276b7d 100644
--- a/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
+++ b/src/main/java/org/jogamp/java3d/utils/scenegraph/io/state/org/jogamp/java3d/utils/universe/ViewerAvatarState.java
@@ -37,11 +37,11 @@
  *
  */
 
-package org.jogamp.java3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
+package org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.universe;
 
 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.scenegraph.io.state.org.jogamp.java3d.BranchGroupState;
 import org.jogamp.java3d.utils.universe.ViewerAvatar;
 
 public class ViewerAvatarState extends BranchGroupState {